This commit is contained in:
Shokouhi
2019-05-09 15:15:59 +04:30
parent f55a8ebc95
commit 56b108401a
8 changed files with 471 additions and 113 deletions
+1 -1
View File
@@ -514,7 +514,7 @@ var render = function() {
staticClass:
"white--text mr-1 caption"
},
[_vm._v("fas fa-pen")]
[_vm._v("fas fa-eye")]
),
_vm._v(" "),
_c("span", [_vm._v("Show")])
Vendored
+1 -5
View File
@@ -227,11 +227,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
// Module
<<<<<<< HEAD
exports.push([module.i, "\n.WM-ActionButton[data-v-b1f1b72e] {\r\n padding: 8px 22px;\n}\r\n", ""]);
=======
exports.push([module.i, "\n.WM-ActionButton[data-v-b1f1b72e] {\n padding: 8px 22px;\n}\n", ""]);
>>>>>>> 116ef9e130916c23ffec776f35fb489cbc506d58
exports.push([module.i, "\n.WM-ActionButton[data-v-b1f1b72e] {\r\n padding: 8px 22px;\n}\r\n", ""]);
+1 -5
View File
@@ -1,7 +1,3 @@
{
<<<<<<< HEAD
"/vue/js/app.js": "/vue/js/app.js?id=b4534e69c5368a1cd1b1"
=======
"/vue/js/app.js": "/vue/js/app.js?id=b1ffa939001e67dfabbc"
>>>>>>> 116ef9e130916c23ffec776f35fb489cbc506d58
"/vue/js/app.js": "/vue/js/app.js?id=62f9c870e1e8daddb78f"
}
+327 -86
View File
@@ -3366,11 +3366,7 @@ 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() {
>>>>>>> 116ef9e130916c23ffec776f35fb489cbc506d58
if (this.form.code != '') {
this.changePassword({
form: this.form
@@ -3463,6 +3459,132 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
@@ -3516,9 +3638,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
/* harmony default export */ __webpack_exports__["default"] = ({
data: function data() {
return {
data: {}
};
return {};
},
methods: {// ...mapMutations("modal", ["closeModal", "setResultModal"]),
// async changeRole() {
@@ -17396,10 +17516,10 @@ render._withStripped = true
/***/ }),
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&":
/*!****************************************************************************************************************************************************************************************************************************!*\
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e& ***!
\****************************************************************************************************************************************************************************************************************************/
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true&":
/*!****************************************************************************************************************************************************************************************************************************************!*\
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true& ***!
\****************************************************************************************************************************************************************************************************************************************/
/*! exports provided: render, staticRenderFns */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -17412,43 +17532,123 @@ var render = function() {
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c(
"div",
"v-container",
{ attrs: { "grid-list-xs": "" } },
[
_c(
"v-container",
{ attrs: { fluid: "" } },
"material-card",
{ attrs: { color: "black", title: "Submit Test Result" } },
[
_c(
"material-card",
{ attrs: { color: "black", title: "Show Test Resualt", text: "" } },
"v-layout",
{
staticClass: "px-5 my-3",
attrs: { "align-left": "", "justify-left": "", wrap: "" }
},
[
_c("h3", { staticClass: "ml-3" }, [_vm._v("Common Info")]),
_vm._v(" "),
_c("v-flex", { attrs: { xs12: "" } }, [
_c("hr", { staticClass: "v-divider theme--light" })
]),
_vm._v(" "),
_c(
"v-layout",
{
staticClass: "my-3",
attrs: { "align-center": "", wrap: "" }
},
{ staticClass: "ml-4", attrs: { row: "", wrap: "" } },
[
_c("v-flex", { attrs: { xs12: "", md12: "", sm12: "" } }, [
_c("div", [
_vm._v("Auto Clave Id : " + _vm._s(_vm.data.autoclave_id))
_c("v-flex", { attrs: { xs12: "", md6: "", sm6: "" } }, [
_c("div", {}, [
_c("span", { staticClass: "title" }, [
_vm._v("Auto Clave Id : ")
]),
_vm._v(" "),
_c("span", { staticClass: "headline ml-2" }, [
_vm._v(_vm._s(_vm.data.autoclave_id))
])
])
]),
_vm._v(" "),
_c("v-flex", { attrs: { xs12: "", md12: "", sm12: "" } }, [
_c("div", [_vm._v("Result : " + _vm._s(_vm.data.result))])
_c("v-flex", { attrs: { xs12: "", md6: "", sm6: "" } }, [
_c(
"div",
{},
[
_c("span", { staticClass: "title" }, [
_vm._v("Result : ")
]),
_vm._v(" "),
_c(
"v-icon",
{ staticClass: "green--text ml-2 caption" },
[_vm._v("fas fa-check")]
),
_vm._v(" "),
_c("span", { staticClass: "headline ml-1" }, [
_vm._v(_vm._s(_vm.data.result))
])
],
1
)
]),
_vm._v(" "),
_c("v-flex", { attrs: { xs12: "", md12: "", sm12: "" } }, [
_c("div", [_vm._v("verify : " + _vm._s(_vm.data.verified))])
_c("v-flex", { attrs: { xs12: "", md6: "", sm6: "" } }, [
_c(
"div",
{},
[
_c("span", { staticClass: "title" }, [
_vm._v("verify : ")
]),
_vm._v(" "),
_c(
"v-icon",
{ staticClass: "pink--text ml-2 caption" },
[_vm._v("fas fa-times")]
),
_vm._v(" "),
_c("span", { staticClass: "headline ml-1" }, [
_vm._v(_vm._s(_vm.data.verified))
])
],
1
)
]),
_vm._v(" "),
_c("v-flex", { attrs: { xs12: "", md12: "", sm12: "" } }, [
_c("div", [
_vm._v("Register User : " + _vm._s(_vm.data.user.name))
_c("v-flex", { attrs: { xs12: "", md6: "", sm6: "" } }, [
_c("div", {}, [
_c("span", { staticClass: "title" }, [
_vm._v("Register User : ")
]),
_vm._v(" "),
_c("span", { staticClass: "headline ml-2" }, [
_vm._v(_vm._s(_vm.data.user.name))
])
])
]),
_vm._v(" "),
])
],
1
)
],
1
),
_vm._v(" "),
_c(
"v-layout",
{
staticClass: "px-5 my-3",
attrs: { "align-left": "", "justify-left": "", wrap: "" }
},
[
_c("h3", { staticClass: "ml-3" }, [_vm._v("Special Info")]),
_vm._v(" "),
_c("v-flex", { attrs: { xs12: "" } }, [
_c("hr", { staticClass: "v-divider theme--light" })
]),
_vm._v(" "),
_c(
"v-layout",
{ attrs: { row: "", wrap: "" } },
[
_vm.data.inputs
? _vm._l(_vm.data.inputs, function(inputData, keyInputs) {
return _c(
@@ -17458,10 +17658,12 @@ var render = function() {
attrs: { xs12: "", md12: "", sm12: "" }
},
[
_c("div", [
_vm._v(
_vm._s(keyInputs) + " : " + _vm._s(inputData)
)
_c("span", { staticClass: "title" }, [
_vm._v(_vm._s(keyInputs) + " :")
]),
_vm._v(" "),
_c("span", { staticClass: "headline ml-2" }, [
_vm._v(_vm._s(inputData))
])
]
)
@@ -17480,19 +17682,19 @@ var render = function() {
attrs: { xs12: "", md12: "", sm12: "" }
},
[
_c(
"div",
[
_vm._v(_vm._s(keyOptions) + " : "),
_vm._l(optionData, function(data, dataKey) {
return _c("span", { key: dataKey }, [
_vm._v(_vm._s(data) + ", ")
])
})
],
2
)
]
_c("span", { staticClass: "title" }, [
_vm._v(_vm._s(keyOptions) + " : ")
]),
_vm._v(" "),
_vm._l(optionData, function(data, dataKey) {
return _c(
"span",
{ key: dataKey, staticClass: "headline ml-2" },
[_vm._v(_vm._s(data) + ", ")]
)
})
],
2
)
})
: _vm._e(),
@@ -17506,30 +17708,40 @@ var render = function() {
attrs: { xs12: "", md12: "", sm12: "" }
},
[
_c("h1", [_vm._v(_vm._s(keyForm))]),
_c("h3", { staticClass: "ml-3" }, [
_vm._v(_vm._s(keyForm))
]),
_vm._v(" "),
_vm._l(formData, function(childData, keyChild) {
return _c("div", { key: keyChild }, [
_c(
"div",
{ staticClass: "ml-4" },
[
_vm._v(
_vm._s(keyChild) +
" : \n "
),
_c("span", { staticClass: "title" }, [
_vm._v(_vm._s(keyChild) + " :")
]),
_vm._v(" "),
Array.isArray(childData)
? _vm._l(childData, function(
data,
dataKey
) {
return _c("span", { key: dataKey }, [
_vm._v(_vm._s(data) + ", ")
])
return _c(
"span",
{
key: dataKey,
staticClass: "headline ml-2"
},
[_vm._v(_vm._s(data) + ", ")]
)
})
: [
_c("span", [
_vm._v(_vm._s(childData))
])
_c(
"span",
{ staticClass: "headline ml-2" },
[_vm._v(_vm._s(childData))]
)
]
],
2
@@ -17543,17 +17755,46 @@ var render = function() {
: _vm._e()
],
2
),
_vm._v(" "),
_c("v-divider"),
_vm._v(" "),
)
],
1
),
_vm._v(" "),
_c(
"v-layout",
{
attrs: {
row: "",
wrap: "",
"align-center": "",
"justify-center": ""
}
},
[
_c(
"v-layout",
{
staticClass: "my-3",
attrs: { "align-center": "", wrap: "" }
},
[_c("v-flex", { attrs: { md12: "" } })],
"v-flex",
{ attrs: { xs12: "", md2: "", sm2: "" } },
[
_c(
"v-btn",
{
staticClass: "WM-CyanBlueGradient-BG",
staticStyle: { padding: "10px 60px" }
},
[
_c(
"v-icon",
{ staticClass: "white--text mr-2 caption" },
[_vm._v("fas fa-check")]
),
_vm._v(" "),
_c("span", { staticClass: "white--text" }, [
_vm._v("Verify")
])
],
1
)
],
1
)
],
@@ -62334,7 +62575,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Show.vue?vue&type=template&id=9160f06e& */ "./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&");
/* harmony import */ var _Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Show.vue?vue&type=template&id=9160f06e&scoped=true& */ "./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true&");
/* harmony import */ var _Show_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Show.vue?vue&type=script&lang=js& */ "./resources/js/vue/components/modal/testresult/Show.vue?vue&type=script&lang=js&");
/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
@@ -62346,11 +62587,11 @@ __webpack_require__.r(__webpack_exports__);
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
_Show_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
_Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__["render"],
_Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
_Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"],
_Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
false,
null,
null,
"9160f06e",
null
)
@@ -62376,19 +62617,19 @@ __webpack_require__.r(__webpack_exports__);
/***/ }),
/***/ "./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&":
/*!**********************************************************************************************!*\
!*** ./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e& ***!
\**********************************************************************************************/
/***/ "./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true&":
/*!**********************************************************************************************************!*\
!*** ./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true& ***!
\**********************************************************************************************************/
/*! exports provided: render, staticRenderFns */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../node_modules/vue-loader/lib??vue-loader-options!./Show.vue?vue&type=template&id=9160f06e& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&");
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../node_modules/vue-loader/lib??vue-loader-options!./Show.vue?vue&type=template&id=9160f06e&scoped=true& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/vue/components/modal/testresult/Show.vue?vue&type=template&id=9160f06e&scoped=true&");
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_Show_vue_vue_type_template_id_9160f06e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -62784,7 +63025,7 @@ Object(vuex_router_sync__WEBPACK_IMPORTED_MODULE_6__["sync"])(_store__WEBPACK_IM
vue__WEBPACK_IMPORTED_MODULE_1___default.a.config.productionTip = false;
_services__WEBPACK_IMPORTED_MODULE_11__["ApiService"].setHeader(); // Set the base URL of the API
_services__WEBPACK_IMPORTED_MODULE_11__["ApiService"].init(Object({"MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).MIX_APP_ROOT_API);
_services__WEBPACK_IMPORTED_MODULE_11__["ApiService"].init("/api/");
__webpack_require__(/*! ./services/global/errorHandler.service */ "./resources/js/vue/services/global/errorHandler.service.js"); // If token exists set Authorizion header
@@ -63361,8 +63602,8 @@ var UserService = {
grant_type: "password"
},
auth: {
username: Object({"MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
username: "2",
password: "g0Km7WE818LAymknK7g7eWpdKIVYqHUytHtynUDt"
}
};
_context.prev = 1;
@@ -63421,8 +63662,8 @@ var UserService = {
refresh_token: refreshToken
},
auth: {
username: Object({"MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).MIX_APP_CLIENT_ID,
password: Object({"MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).MIX_APP_CLIENT_SECRET
username: "2",
password: "g0Km7WE818LAymknK7g7eWpdKIVYqHUytHtynUDt"
}
};
_context2.prev = 2;