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

destroy item & package

Browse Source
This commit is contained in:
Fayyazi
2019-07-18 20:26:01 +04:30
parent 58038a778c
commit d106380b0e
11 changed files with 588 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+4 -1
View File
@@ -31,7 +31,6 @@ class ItemController extends Controller
}
public function store(StoreItemRequest $request)
{
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$ItemData = [
'name' => $request->name,
'result' => $request->result,
@@ -57,6 +56,10 @@ class ItemController extends Controller
if (!auth('api')->user()->can('delete', $Item)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Item->packages))
{
$Item->packages()->detach();
}
$Item->delete();
return \MessageResponse::success(trans('messages.success'));
}
app/Http/Controllers/PackageController.php
+4
View File
@@ -62,6 +62,10 @@ class PackageController extends Controller
if (!auth('api')->user()->can('delete', $Package)) {
return \MessageResponse::error(trans('messages.access_denied'));
}
if(count($Package->items))
{
$Package->items()->detach();
}
$Package->delete();
return \MessageResponse::success(trans('messages.success'));
}
app/Http/Requests/StorePackageRequest.php
+2
View File
@@ -27,6 +27,7 @@ class StorePackageRequest extends FormRequest
return [
'name' => 'required|max:100|unique:packages',
'result' => 'required',
'items' => 'required',
];
break;
}
@@ -37,6 +38,7 @@ class StorePackageRequest extends FormRequest
'name' => 'required|max:100|unique:packages,id,'.$Package->id,
'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
'result' => 'required',
'items' => 'required',
];
break;
app/Http/Requests/StoreTestResultRequest.php
+1 -1
View File
@@ -25,7 +25,7 @@ class StoreTestResultRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
'device_id' => 'requisred',
'device_id' => 'required',
'cycle_number' => 'required',
'test_type_id' => 'required|numeric|exists:test_types,id',
'result' => 'required',
public/js/vue/app.js
Vendored
+373 -22
View File
File diff suppressed because one or more lines are too long
resources/js/vue/components/modal/item/show.vue
+66
View File
@@ -0,0 +1,66 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Show Item">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Common Info</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Name :</span>
<span class="headline ml-1" style="letter-spacing:0 !important">{{ data.name }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Result :</span>
<v-icon v-if="data.result == 'Pass'" class="green--text ml-2 caption">fas fa-check</v-icon>
<v-icon v-if="data.result == 'Fail'" class="pink--text ml-2 caption">fas fa-times</v-icon>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Register User :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
</div>
</v-flex>
<v-flex xs12 md6 sm6>
<div class>
<span class="title">Date :</span>
<span class="headline ml-2" style="letter-spacing:0 !important">{{ data.created_at }}</span>
</div>
</v-flex>
</v-layout>
</v-layout>
</material-card>
</v-container>
</template>
<script>
export default {
data: () => ({
data: {}
})
};
</script>
<script>
import { mapGetters, mapMutations } from "vuex";
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
export default {
data: () => ({
data : {}
}),
methods: {
...mapMutations("modal", ["closeModal", "setResultModal"]),
},
created() {
this.data = this.getModalProperties.result.data.data;
},
computed: {
...mapGetters("modal", ["getModalProperties"])
}
};
</script>
resources/js/vue/components/modal/package/Show.vue
+14
View File
@@ -48,6 +48,19 @@
</v-flex>
</v-layout>
</v-layout>
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Items</h3>
<v-flex xs12>
<hr class="v-divider theme--light">
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<div class v-for="(item, key) in data.items" :key="key">
<span class="headline ml-2" style="letter-spacing:0 !important">{{ key+1 + ": " + item.name }}</span>
</div>
</v-flex>
</v-layout>
</v-layout>
<v-layout row wrap align-center justify-center v-if="$hasRole('Admin|Supervisor')">
<v-flex
class
@@ -102,6 +115,7 @@ export default {
},
created() {
this.data = this.getModalProperties.result.data.data;
},
computed: {
...mapGetters("modal", ["getModalProperties"])
resources/js/vue/components/modal/testresult/Show.vue
+5 -3
View File
@@ -1,7 +1,7 @@
<template>
<v-container grid-list-xs>
<material-card color="black" title="Submit Test Result" id="printMe">
<material-card color="black" title="Show Test Result" id="printMe">
<v-layout align-left justify-left wrap class="px-5 my-3">
<h3 class="ml-3">Common Info</h3>
<v-flex xs12>
@@ -139,8 +139,8 @@
<hr class="v-divider theme--light" />
</v-flex>
<v-layout row wrap class="ml-4">
<v-flex xs12 md6 sm6>
<img :src="'/'+data.imagePath" style="width: 100%" />
<v-flex xs12 md6 sm6 v-for="(img, key) in data.title_image" :key="key">
<img :src="'/'+img.path" style="width: 100%" />
</v-flex>
</v-layout>
</v-layout>
@@ -240,6 +240,8 @@ export default {
},
created() {
this.data = this.getModalProperties.result.data.data;
console.log(this.data);
},
computed: {
...mapGetters("modal", ["getModalProperties"])
resources/js/vue/views/Item/List.vue
-15
View File
@@ -20,14 +20,6 @@
:items="result"
></v-autocomplete>
</v-flex>
<v-flex xs12 md3 sm3>
<v-text-field
class="pa-2"
v-model="filter.unique_id"
label="uniqueID"
color="black"
></v-text-field>
</v-flex>
<v-flex class xs12 md2 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
@@ -55,7 +47,6 @@
/>
</template>
<template slot="items" slot-scope="{ item }">
<td class="headline font-weight-light">{{ item.unique_id }}</td>
<td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.result }}</td>
<td class="title font-weight-light">{{ item.created_at }}</td>
@@ -115,11 +106,6 @@ import { mapMutations, mapGetters } from "vuex";
export default {
data: () => ({
headers: [
{
sortable: true,
text: "Unique ID",
value: "Unique ID"
},
{
sortable: true,
text: "Name",
@@ -143,7 +129,6 @@ export default {
}
],
filter: {
unique_id: '',
name: '',
result: '',
},
resources/js/vue/views/Package/AddEdit.vue
+118 -103
View File
@@ -1,115 +1,130 @@
<template>
<v-form ref="form">
<v-container grid-list-xs fluid>
<material-card color="black" title="Add Package">
<v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm4 md4>
<v-text-field
name="name"
label="Name"
color="black"
v-model="formData.name"
:rules="[rules.required, rules.counter]"
class="pa-2"
></v-text-field>
</v-flex>
<v-flex xs12 sm4 md4>
<v-select
:items="result"
label="Result"
name="result"
v-model="formData.result"
single-line
:rules="[rules.required]"
class="pa-2"
color="black"
></v-select>
</v-flex>
</v-layout>
<v-layout align-center justify-center wrap class="px-5 mb-3">
<v-flex xs12 sm12 md12>
<v-autocomplete multiple
:items="items"
item-text="name"
item-value="id"
label="Select Items For Package"
>
</v-autocomplete>
</v-flex>
</v-layout>
<v-layout row wrap justify-center align-center>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="submitForm()">
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
</v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{name: 'AllPackage'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
</router-link>
</v-flex>
</v-layout>
</material-card>
</v-container>
</v-form>
<v-form ref="form">
<v-container grid-list-xs fluid>
<material-card color="black" title="Add Package">
<v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm4 md4>
<v-text-field
name="name"
label="Name"
color="black"
v-model="formData.name"
:rules="[rules.required, rules.counter]"
class="pa-2"
></v-text-field>
</v-flex>
<v-flex xs12 sm4 md4>
<v-select
:items="result"
label="Result"
name="result"
v-model="formData.result"
single-line
:rules="[rules.required]"
class="pa-2"
color="black"
></v-select>
</v-flex>
</v-layout>
<v-layout align-center justify-center wrap class="px-5 mb-3">
<v-flex xs12 sm12 md12>
<v-autocomplete
multiple
:items="items"
item-text="name"
v-model="formData.items"
item-value="id"
label="Select Items For Package"
></v-autocomplete>
</v-flex>
</v-layout>
<v-layout row wrap justify-center align-center>
<v-flex xs12 md2 sm2 class="text-md-center text-xs-center">
<v-btn
class="WM-CyanBlueGradient-BG"
style="padding:10px 60px"
@click="submitForm()"
>
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
</v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<router-link :to="{name: 'AllPackage'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text">keyboard_arrow_left</v-icon>
<span class="black--text">Back</span>
</v-btn>
</router-link>
</v-flex>
</v-layout>
</material-card>
</v-container>
</v-form>
</template>
<script>
import { ApiService } from "@/services";
import { urls } from "@/config/urls";
import { mapMutations } from 'vuex';
import { mapMutations } from "vuex";
export default {
data() {
return {
formData: {
name: "",
result: "",
description: "",
},
items:[] ,
result: ["Pass", "Fail"],
rules: {
required: value => !!value || "Required.",
counter: value =>
!value || value.length == 0 || value.length >= 5 || "Min 5 characters",
}
};
},
created() {
if (this.$route.params.package) {
this.load(this.$route.params.package);
}
this.loadItems();
},
methods: {
async load(id) {
const result = await ApiService.get(urls.editPackage(id));
if (result.status == 200) {
this.formData = result.data.data;
}
data() {
return {
formData: {
name: "",
result: "",
description: "",
items: []
},
items: [],
result: ["Pass", "Fail"],
rules: {
required: value => !!value || "Required.",
counter: value =>
!value ||
value.length == 0 ||
value.length >= 5 ||
"Min 5 characters"
}
};
},
async loadItems() {
const result = await ApiService.get(urls.listAllItem());
if (result.status == 200) {
this.items = result.data.data;
}
created() {
if (this.$route.params.package) {
this.load(this.$route.params.package);
}
this.loadItems();
},
async submitForm() {
let result;
if (this.$route.params.package) {
result = await ApiService.put(urls.updatePackage(this.$route.params.package), this.formData);
} else {
result = await ApiService.post(urls.storePackage, this.formData);
}
methods: {
async load(id) {
const result = await ApiService.get(urls.editPackage(id));
if (result.status == 200) {
this.formData = result.data.data;
}
},
async loadItems() {
const result = await ApiService.get(urls.listAllItem());
if (result.status == 200) {
this.items = result.data.data;
}
},
async submitForm() {
let result;
if (this.$route.params.package) {
result = await ApiService.put(
urls.updatePackage(this.$route.params.package),
this.formData
);
} else {
result = await ApiService.post(
urls.storePackage,
this.formData
);
}
if (result && result.status == 200) {
this.$router.push({name: 'AllPackage'})
}
},
}
if (result && result.status == 200) {
this.$router.push({ name: "AllPackage" });
}
}
}
};
</script>
resources/js/vue/views/TestType/List.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<v-container fluid>
<material-card class color="black" title="Medical Centers List" text>
<material-card class color="black" title="TestType List" text>
<v-layout wrap class="px-5 mb-3">
<v-flex xs12 md4 sm3 class="pr-3">
<v-text-field label="Name" v-model="filter.name" color="black"></v-text-field>