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

haminjory

Browse Source
This commit is contained in:
saeid
2019-05-06 13:50:58 +04:30
parent 2b89b55ae0 d147ecaacb
commit 5d8500dafd
20 changed files with 167 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Auth/ResetPasswordController.php
+1 -1
View File
@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
if (auth('api')->check()) {
$user = auth('api')->user();
$user->password = Hash::make($request->password);
$user->password = \Hash::make($request->password);
$user->save();
return \MessageResponse::success('Success Change Password');
}
app/Http/Controllers/MedicalCenterController.php
+8 -6
View File
@@ -22,8 +22,8 @@ class MedicalCenterController extends Controller
public function store(StoreMedicalCenterRequest $request)
{
$MedicalCenter = MedicalCenter::create($request->all());
return response()->json(trans('messages.success'));
MedicalCenter::create($request->all());
return \MessageResponse::success(trans('messages.success'));
}
public function show($id)
@@ -32,22 +32,24 @@ class MedicalCenterController extends Controller
// return response()->json(['MedicalCenter' => $MedicalCenter]);
}
public function edit($id)
public function edit(MedicalCenter $MedicalCenter)
{
$MedicalCenter = MedicalCenter::with('users')->findOrFail($id);
return response()->json(['MedicalCenter' => $MedicalCenter]);
$MedicalCenter = $MedicalCenter->load('users');
return \MessageResponse::data($MedicalCenter);
}
public function update(StoreMedicalCenterRequest $request, MedicalCenter $MedicalCenter)
{
$MedicalCenter->update($request->all());
return response()->json(trans('messages.success'));
return \MessageResponse::success(trans('messages.success'));
}
public function destroy(MedicalCenter $MedicalCenter)
{
if ($MedicalCenter->users->count() == 0) {
$MedicalCenter->delete();
return \MessageResponse::success(trans('messages.success'));
}
return \MessageResponse::error(trans('messages.failed'));
}
}
public/10.js
Vendored
+4 -1
View File
@@ -94,7 +94,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
case 2:
result = _context.sent;
this.medicalCenter = result.data.MedicalCenter;
if (result && result.status == 200) {
this.medicalCenter = result.data.data;
}
case 4:
case "end":
public/16.js
Vendored
+14 -6
View File
@@ -155,6 +155,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
@@ -244,10 +246,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
if (result.data.data.inputs[key].type == 'Form') {
for (keyForm in result.data.data.inputs[key].children) {
if (result.data.data.inputs[key].children.hasOwnProperty(keyForm)) {
this.formData[result.data.data.inputs[key].children[keyForm].name] = '';
if (result.data.data.inputs[key].children[keyForm].type == 'Checkbox' || result.data.data.inputs[key].children[keyForm].type == 'Select') {
this.formData[result.data.data.inputs[key].children[keyForm].name] = [];
console.log(this.formData[result.data.data.inputs[key].children[keyForm].name]);
} else {
this.formData[result.data.data.inputs[key].children[keyForm].name] = '';
}
}
}
} else if (result.data.data.inputs[key].type == 'Checkbox') {
} else if (result.data.data.inputs[key].type == 'Checkbox' || result.data.data.inputs[key].type == 'Select') {
this.formData[result.data.data.inputs[key].name] = [];
} else {
this.formData[result.data.data.inputs[key].name] = '';
@@ -288,8 +295,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
var _submitForm = _asyncToGenerator(
/*#__PURE__*/
_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.mark(function _callee3() {
var _result2, _result3;
var result;
return _babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default.a.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
@@ -303,7 +309,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return _services__WEBPACK_IMPORTED_MODULE_1__["ApiService"].put(_config_urls__WEBPACK_IMPORTED_MODULE_2__["urls"].updateTestResult(this.$route.params.testResult), this.formData);
case 3:
_result2 = _context3.sent;
result = _context3.sent;
_context3.next = 9;
break;
@@ -312,7 +318,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return _services__WEBPACK_IMPORTED_MODULE_1__["ApiService"].post(_config_urls__WEBPACK_IMPORTED_MODULE_2__["urls"].storeTestResult, this.formData);
case 8:
_result3 = _context3.sent;
result = _context3.sent;
case 9:
if (result && result.status == 200) {
@@ -554,6 +560,7 @@ var render = function() {
item.type == "Select"
? _c("v-select", {
attrs: {
multiple: "",
items: item.options,
label: item.name,
color: "black",
@@ -645,6 +652,7 @@ var render = function() {
children.type == "Select"
? _c("v-select", {
attrs: {
multiple: "",
items: children.options,
label: children.name,
color: "black",
public/17.js
Vendored
+26 -1
View File
@@ -109,6 +109,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
//
//
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
@@ -410,6 +414,27 @@ var render = function() {
"td",
{ staticClass: "text-xs-right" },
[
_c(
"v-btn",
{
staticClass: "mr-2",
attrs: { color: "cyan" }
},
[
_c(
"v-icon",
{
staticClass:
"white--text mr-1 caption"
},
[_vm._v("fas fa-pen")]
),
_vm._v(" "),
_c("span", [_vm._v("Show")])
],
1
),
_vm._v(" "),
_c(
"router-link",
{
@@ -425,7 +450,7 @@ var render = function() {
"v-btn",
{
staticClass: "mr-2",
attrs: { color: "cyan" }
attrs: { color: "orange" }
},
[
_c(
public/19.js
Vendored
+2 -2
View File
@@ -123,10 +123,10 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return !!value || "Required.";
},
counter: function counter(value) {
return value.length == 0 || value.length >= 5 || "Min 5 characters";
return !value || value.length == 0 || value.length >= 5 || "Min 5 characters";
},
email: function email(value) {
if (value.length > 0) {
if (value && value.length > 0) {
var pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return pattern.test(value) || "Invalid e-mail.";
}
public/6.js
Vendored
+22 -4
View File
@@ -66,6 +66,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
//
//
//
//
//
@@ -74,6 +76,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
return {
form: {
cell_number: ""
},
rules: {
required: function required(value) {
return !!value || "Required.";
},
cellNumberCounter: function cellNumberCounter(value) {
return value && value.length == 11 || "must 11 characters";
}
}
};
},
@@ -87,9 +97,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
while (1) {
switch (_context.prev = _context.next) {
case 0:
this.forgotPassword({
form: this.form
});
if (this.$refs.form.validate()) {
this.forgotPassword({
form: this.form
});
}
case 1:
case "end":
@@ -127,6 +139,7 @@ var render = function() {
var _c = _vm._self._c || _h
return _c(
"v-form",
{ ref: "form" },
[
_c(
"v-container",
@@ -159,7 +172,12 @@ var render = function() {
attrs: {
name: "cellnumber",
label: "Cell Number",
color: "black"
color: "black",
rules: [
_vm.rules.required,
_vm.rules.cellNumberCounter
],
mask: "#### ### ####"
},
model: {
value: _vm.form.cell_number,
public/7.js
Vendored
+26 -4
View File
@@ -68,20 +68,33 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
//
//
//
//
//
/* harmony default export */ __webpack_exports__["default"] = ({
data: function data() {
return {
cell_number: "",
password: "",
show1: false
show1: false,
rules: {
required: function required(value) {
return !!value || "Required.";
},
passCounter: function passCounter(value) {
return value && value.length >= 8 || "Min 8 characters";
},
cellNumberCounter: function cellNumberCounter(value) {
return value && value.length == 11 || "must 11 characters";
}
}
};
},
computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapGetters"])('auth', ['authenticating', 'authenticationError', 'authenticationErrorCode'])),
methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['login']), {
handleSubmit: function handleSubmit() {
// Perform a simple validation that cell_number and password have been typed in
if (this.cell_number != '' && this.password != '') {
if (this.$refs.form.validate()) {
this.login({
cell_number: this.cell_number,
password: this.password
@@ -111,6 +124,7 @@ var render = function() {
var _c = _vm._self._c || _h
return _c(
"v-form",
{ ref: "form" },
[
_c(
"v-container",
@@ -143,8 +157,12 @@ var render = function() {
attrs: {
name: "cellnumber",
label: "Cell Number",
id: "id1",
color: "black"
color: "black",
rules: [
_vm.rules.required,
_vm.rules.cellNumberCounter
],
mask: "#### ### ####"
},
model: {
value: _vm.cell_number,
@@ -178,6 +196,10 @@ var render = function() {
"append-icon": _vm.show1
? "visibility"
: "visibility_off",
rules: [
_vm.rules.required,
_vm.rules.passCounter
],
color: "black"
},
on: {
public/8.js
Vendored
+3 -3
View File
@@ -120,13 +120,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
return !!value || "Required.";
},
nameCounter: function nameCounter(value) {
return value.length >= 5 || "Min 5 characters";
return value && value.length >= 5 || "Min 5 characters";
},
passCounter: function passCounter(value) {
return value.length >= 6 || "Min 6 characters";
return value && value.length >= 8 || "Min 8 characters";
},
cellNumberCounter: function cellNumberCounter(value) {
return value.length == 11 || "must 11 characters";
return value && value.length == 11 || "must 11 characters";
}
}
};
public/mix-manifest.json
+4
View File
@@ -1,3 +1,7 @@
{
<<<<<<< HEAD
"/vue/js/app.js": "/vue/js/app.js?id=834d97fecc500a7e0804"
=======
"/vue/js/app.js": "/vue/js/app.js?id=24a7b3a8d1891f421dee"
>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95
}
public/vue/js/app.js
Vendored
+7
View File
@@ -3366,7 +3366,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
};
},
methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['changePassword']), {
<<<<<<< HEAD
submitVerifyCode: function submitVerifyCode() {
=======
submitChangePassword: function submitChangePassword() {
>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95
if (this.form.code != '') {
this.changePassword({
form: this.form
@@ -63854,6 +63858,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
commit('modal/closeModal', {}, {
root: true
});
_router__WEBPACK_IMPORTED_MODULE_2__["default"].push({
name: "Dashboard"
});
}
case 6:
resources/js/vue/components/modal/auth/ChangePassword.vue
+1 -1
View File
@@ -51,7 +51,7 @@ export default {
...mapActions('auth', [
'changePassword'
]),
submitVerifyCode() {
submitChangePassword() {
if (this.form.code != '') {
this.changePassword({form: this.form});
}
resources/js/vue/store/modules/auth/actions.js
Vendored
+1
View File
@@ -47,6 +47,7 @@ export default {
var response = await ApiService.post(urls.changePassword, form);
if(response && response.status == 200 ) {
commit('modal/closeModal', {}, {root: true});
router.push({ name: `Dashboard` });
}
},
resources/js/vue/views/Auth/ForgotPassword.vue
+10 -2
View File
@@ -1,5 +1,5 @@
<template>
<v-form>
<v-form ref="form">
<v-container grid-list-xs>
<v-layout row wrap class="justify-center">
<v-flex xs12 md3 sm3 class="WM-WidthScreen-SM WM-WidthScreen-XS">
@@ -11,6 +11,8 @@
name="cellnumber"
label="Cell Number"
color="black"
:rules="[rules.required, rules.cellNumberCounter]"
mask="#### ### ####"
></v-text-field>
</v-flex>
</v-layout>
@@ -49,6 +51,10 @@ export default {
return {
form :{
cell_number: ""
},
rules: {
required: value => !!value || "Required.",
cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
}
};
},
@@ -56,7 +62,9 @@ export default {
...mapActions("auth", ["forgotPassword"]),
// ...mapMutations("modal", ["changeCurrentModal"]),
async handleSubmit() {
this.forgotPassword({form : this.form});
if (this.$refs.form.validate()) {
this.forgotPassword({form : this.form});
}
}
}
};
resources/js/vue/views/Auth/Login.vue
+13 -7
View File
@@ -1,5 +1,5 @@
<template>
<v-form >
<v-form ref="form" >
<v-container grid-list-xs>
<v-layout row wrap class="justify-center">
<v-flex xs12 md3 sm3 class="WM-WidthScreen-SM WM-WidthScreen-XS">
@@ -12,8 +12,9 @@
v-model="cell_number"
name="cellnumber"
label="Cell Number"
id="id1"
color="black"
:rules="[rules.required, rules.cellNumberCounter]"
mask="#### ### ####"
></v-text-field>
</v-flex>
</v-layout>
@@ -26,6 +27,7 @@
:type="show1 ? 'text' : 'password'"
:append-icon="show1 ? 'visibility' : 'visibility_off'"
@click:append="show1 = !show1"
:rules="[rules.required, rules.passCounter]"
color="black"
class="pa-2"
></v-text-field>
@@ -60,6 +62,11 @@ export default {
cell_number: "",
password: "",
show1: false,
rules: {
required: value => !!value || "Required.",
passCounter: value => (value && value.length >= 8) || "Min 8 characters",
cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
}
};
},
computed: {
@@ -75,11 +82,10 @@ export default {
]),
handleSubmit() {
// Perform a simple validation that cell_number and password have been typed in
if (this.cell_number != '' && this.password != '') {
this.login({cell_number: this.cell_number, password: this.password});
this.password = "";
}
if (this.$refs.form.validate()) {
this.login({cell_number: this.cell_number, password: this.password});
this.password = "";
}
}
}
};
resources/js/vue/views/Auth/Register.vue
+3 -3
View File
@@ -101,9 +101,9 @@ export default {
isLogin: TokenService.getInfo(),
rules: {
required: value => !!value || "Required.",
nameCounter: value => value.length >= 5 || "Min 5 characters",
passCounter: value => value.length >= 6 || "Min 6 characters",
cellNumberCounter: value => value.length == 11 || "must 11 characters"
nameCounter: value => (value && value.length >= 5) || "Min 5 characters",
passCounter: value => (value && value.length >= 8) || "Min 8 characters",
cellNumberCounter: value => (value && value.length == 11) || "must 11 characters"
}
};
},
resources/js/vue/views/MedicalCenter/AddEdit.vue
+3 -1
View File
@@ -58,7 +58,9 @@ export default {
methods: {
async load(id) {
const result = await ApiService.get(urls.editMedicalCenter(id));
this.medicalCenter = result.data.MedicalCenter;
if (result && result.status == 200) {
this.medicalCenter = result.data.data;
}
},
async AddMedicalCenter() {
if (this.$refs.form.validate()) {
resources/js/vue/views/TestResult/AddEdit.vue
+12 -4
View File
@@ -63,6 +63,7 @@
color="black"
></v-text-field>
<v-select
multiple
v-if="item.type == 'Select'"
:items="item.options"
v-model="formData[item.name]"
@@ -92,6 +93,7 @@
color="black"
></v-text-field>
<v-select
multiple
v-if="children.type == 'Select'"
:items="children.options"
v-model="formData[children.name]"
@@ -177,10 +179,15 @@ export default {
if(result.data.data.inputs[key].type == 'Form') {
for (const keyForm in result.data.data.inputs[key].children) {
if (result.data.data.inputs[key].children.hasOwnProperty(keyForm)) {
this.formData[result.data.data.inputs[key].children[keyForm].name] = '';
if (result.data.data.inputs[key].children[keyForm].type == 'Checkbox' || result.data.data.inputs[key].children[keyForm].type == 'Select' ) {
this.formData[result.data.data.inputs[key].children[keyForm].name] = [];
console.log(this.formData[result.data.data.inputs[key].children[keyForm].name]);
} else {
this.formData[result.data.data.inputs[key].children[keyForm].name] = '';
}
}
}
} else if(result.data.data.inputs[key].type == 'Checkbox') {
} else if(result.data.data.inputs[key].type == 'Checkbox' || result.data.data.inputs[key].type == 'Select') {
this.formData[result.data.data.inputs[key].name] = [];
} else {
this.formData[result.data.data.inputs[key].name] = '';
@@ -196,10 +203,11 @@ export default {
}
},
async submitForm() {
let result;
if (this.$route.params.testResult) {
const result = await ApiService.put(urls.updateTestResult(this.$route.params.testResult), this.formData);
result = await ApiService.put(urls.updateTestResult(this.$route.params.testResult), this.formData);
} else {
const result = await ApiService.post(urls.storeTestResult, this.formData);
result = await ApiService.post(urls.storeTestResult, this.formData);
}
if (result && result.status == 200) {
resources/js/vue/views/TestResult/List.vue
+5 -1
View File
@@ -55,8 +55,12 @@
<td class="title font-weight-light">{{ item.result }}</td>
<td class="title font-weight-light">{{ item.created_at }}</td>
<td class="text-xs-right">
<v-btn color="cyan" class="mr-2" >
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Show</span>
</v-btn>
<router-link :to="{name: 'EditTestResult', params: {testResult: item.id}}">
<v-btn color="cyan" class="mr-2">
<v-btn color="orange" class="mr-2">
<v-icon class="white--text mr-1 caption">fas fa-pen</v-icon>
<span>Edit</span>
</v-btn>
resources/js/vue/views/User/MyInfo.vue
+2 -2
View File
@@ -101,9 +101,9 @@ export default {
rules: {
required: value => !!value || "Required.",
counter: value =>
value.length == 0 || value.length >= 5 || "Min 5 characters",
!value || value.length == 0 || value.length >= 5 || "Min 5 characters",
email: value => {
if (value.length > 0) {
if (value && value.length > 0) {
const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return pattern.test(value) || "Invalid e-mail.";
}