Skip to content

K
karname-ui
Commit 8ffe8c66 authored by Reza Sahebgharan's avatar Reza Sahebgharan
Browse files
Options

Grid DataTable WAD-6903

parent 761f6ecc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 213 deletions
.babelrc
View file @ 8ffe8c66
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
[ [
"@babel/plugin-proposal-object-rest-spread" "@babel/plugin-proposal-object-rest-spread"
], ],
[
"@babel/plugin-transform-spread"
],
[ [
"@babel/plugin-transform-runtime", "@babel/plugin-transform-runtime",
{ {
......
client/App.vue
View file @ 8ffe8c66
<template> <template>
<transition name="fade" mode="out-in">
<transition name="fade" mode="out-in"> <keep-alive>
<keep-alive> <router-view></router-view>
<router-view></router-view> </keep-alive>
</keep-alive> </transition>
</transition>
</template> </template>
<script> <script>
...@@ -54,9 +52,7 @@ export default { ...@@ -54,9 +52,7 @@ export default {
font-size: 0.5rem; font-size: 0.5rem;
} }
html { @import url(views/css/globalcss.css);
overflow-y: auto !important;
}
</style> </style>
<style scoped> <style scoped>
.fade-enter-active, .fade-enter-active,
......
client/components/Worklist.vue
View file @ 8ffe8c66
This diff is collapsed.
client/plugins/i18n.js
View file @ 8ffe8c66
...@@ -59,9 +59,17 @@ const messages = { ...@@ -59,9 +59,17 @@ const messages = {
CheckPassError: 'incorrect old password', CheckPassError: 'incorrect old password',
SuccessChangePass: 'Password Successfully changed', SuccessChangePass: 'Password Successfully changed',
internalServerError: 'internal server error' internalServerError: 'internal server error'
},
WorkList: {
deviceComboboxLabel: 'please select a device',
deviceComboboxNoDataMatch: 'No results matching',
seachBtn: 'search',
deviceComboboxNoDataMatch1: '',
AllBtn: "All",
UnknownBtn: "Correction Needed",
noDevicemap: 'no device'
} }
}, },
'fa': { 'fa': {
Login: { Login: {
...@@ -119,6 +127,15 @@ const messages = { ...@@ -119,6 +127,15 @@ const messages = {
CheckPassError: 'رمز فعلی نادرست می باشد', CheckPassError: 'رمز فعلی نادرست می باشد',
SuccessChangePass: 'رمز کاربر با موفقیت تغییر یافت', SuccessChangePass: 'رمز کاربر با موفقیت تغییر یافت',
internalServerError: 'خطا در سرور' internalServerError: 'خطا در سرور'
},
WorkList: {
deviceComboboxLabel: 'لطفا یک دستگاه را انتخاب نمایید',
deviceComboboxNoDataMatch: 'هیچ نتیجه ای برابر با',
seachBtn: 'جستجو',
deviceComboboxNoDataMatch1: 'یافت نشد',
AllBtn: "همه",
UnknownBtn: "نیازمند اصلاح",
noDevicemap: 'دستگاه انتخاب نشده است'
} }
} }
......
client/plugins/routes.js
View file @ 8ffe8c66
...@@ -5,7 +5,7 @@ import ChangePassword from '../views/ChangePassword.vue'; ...@@ -5,7 +5,7 @@ import ChangePassword from '../views/ChangePassword.vue';
import Main from '../views/Main.vue'; import Main from '../views/Main.vue';
import EditWorkList from '../components/EditWorkList.vue'; import EditWorkList from '../components/EditWorkList.vue';
import WorkList from '../components/WorkList.vue'; import WorkList from '../components/Worklist.vue';
const routes = [{ const routes = [{
path: '/', path: '/',
......
client/views/Login.vue
View file @ 8ffe8c66
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
<v-row> <v-row>
<v-col cols="12"> <v-col cols="12">
<v-text-field <v-text-field
:autofocus="usernameFocus"
:label="$t('Login.username')" :label="$t('Login.username')"
prepend-icon="mdi-account-circle" prepend-icon="mdi-account-circle"
:rules="[rules.required]" :rules="[rules.required]"
...@@ -35,7 +34,6 @@ ...@@ -35,7 +34,6 @@
</v-col> </v-col>
<v-col cols="12"> <v-col cols="12">
<v-text-field <v-text-field
:autofocus="passwordFocus"
:type="!showPassword?'password' :'text'" :type="!showPassword?'password' :'text'"
:label="$t('Login.password')" :label="$t('Login.password')"
prepend-icon="mdi-lock" prepend-icon="mdi-lock"
...@@ -166,7 +164,7 @@ export default { ...@@ -166,7 +164,7 @@ export default {
that.snackbar = true; that.snackbar = true;
} }
} else { } else {
Meteor.call("Fetchworklist", "ratio");
Meteor.setTimeout(() => { Meteor.setTimeout(() => {
that.loading = false; that.loading = false;
that.$router.push("/main/worklist"); that.$router.push("/main/worklist");
......
client/views/Main.vue
View file @ 8ffe8c66
<template> <template>
<v-app id="inspire"> <v-app id="inspire">
<!-- <div style="height:100%"> -->
<!-- <v-content class="fill-height"> -->
<template v-if="!$vuetify.rtl"> <template v-if="!$vuetify.rtl">
<!-- <v-navigation-drawer v-model="drawerRight" app right clipped :width="$vuetify.breakpoint.width/3" bottom> <!-- <v-navigation-drawer v-model="drawerRight" app right clipped :width="$vuetify.breakpoint.width/3" bottom>
<v-list dense> <v-list dense>
...@@ -17,18 +14,18 @@ ...@@ -17,18 +14,18 @@
</v-list> </v-list>
</v-navigation-drawer>--> </v-navigation-drawer>-->
<keep-alive> <!-- <keep-alive>
<router-view name="edit_worklist"></router-view> <router-view name="edit_worklist"></router-view>
</keep-alive> </keep-alive>-->
<v-app-bar app clipped-right color="teal lighten-3" dark> <v-app-bar app clipped-right color="teal lighten-3" dark>
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon> <v-toolbar-title class="red--text">Karname</v-toolbar-title>
<!-- <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon> -->
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-app-bar-nav-icon @click.stop="drawerRight = !drawerRight"></v-app-bar-nav-icon> <!-- <v-app-bar-nav-icon @click.stop="drawerRight = !drawerRight"></v-app-bar-nav-icon> -->
<v-toolbar-title>Toolbar</v-toolbar-title>
</v-app-bar> </v-app-bar>
<v-navigation-drawer v-model="drawer" app> <!-- <v-navigation-drawer v-model="drawer" app>
<v-list dense> <v-list dense>
<v-list-item @click.stop="left = !left"> <v-list-item @click.stop="left = !left">
<v-list-item-action> <v-list-item-action>
...@@ -39,10 +36,10 @@ ...@@ -39,10 +36,10 @@
</v-list-item-content> </v-list-item-content>
</v-list-item> </v-list-item>
</v-list>left </v-list>left
</v-navigation-drawer> </v-navigation-drawer>-->
</template> </template>
<template v-if="$vuetify.rtl"> <!-- <template v-if="$vuetify.rtl">
<v-navigation-drawer v-model="drawer" app clipped> <v-navigation-drawer v-model="drawer" app clipped>
<v-list dense> <v-list dense>
<v-list-item @click.stop="left = !left"> <v-list-item @click.stop="left = !left">
...@@ -75,47 +72,18 @@ ...@@ -75,47 +72,18 @@
</v-list-item> </v-list-item>
</v-list>right </v-list>right
</v-navigation-drawer> </v-navigation-drawer>
</template> </template>-->
<v-navigation-drawer v-model="left" fixed temporary></v-navigation-drawer> <v-navigation-drawer v-model="left" fixed temporary></v-navigation-drawer>
<v-content class="fill-height"> <v-content>
<v-container class="fill-height align-start" fluid>
<!-- <v-row justify="center" align="center">
<v-col class="shrink">
<v-tooltip right>
<template v-slot:activator="{ on }">
<v-btn :href="source" icon large target="_blank" v-on="on">
<v-icon large>mdi-code-tags</v-icon>
</v-btn>
</template>
<span>Source</span>
</v-tooltip>
<v-tooltip right>
<template v-slot:activator="{ on }">
<v-btn
icon
large
href="https://codepen.io/johnjleider/pen/QewYYx"
target="_blank"
v-on="on"
>
<v-icon large>mdi-codepen</v-icon>
</v-btn>
</template>
<span>Codepen</span>
</v-tooltip>
</v-col>
</v-row>-->
<router-view></router-view> <router-view></router-view>
</v-container> </v-content>
</v-content>
<v-navigation-drawer v-model="right" fixed right temporary></v-navigation-drawer> <v-navigation-drawer v-model="right" fixed right temporary></v-navigation-drawer>
<app-footer></app-footer> <app-footer></app-footer>
<!-- </div> -->
<!-- </v-content> -->
</v-app> </v-app>
</template> </template>
......
client/views/css/globalcss.css 0 → 100644
View file @ 8ffe8c66
html {
overflow-y: hidden !important;
}
body {
overflow: hidden !important;
}
.application {
height: 100%;
}
main {
height: calc(100% - 56px - 36px);
}
.container {
height: 100%;
overflow: auto;
}
\ No newline at end of file
imports/api/collections/devicecode.js 0 → 100644
View file @ 8ffe8c66
import { Mongo } from 'meteor/mongo';
import { Meteor } from 'meteor/meteor';
let DeviceCode;
if (Meteor.isClient || Meteor.isCordova) {
DeviceCode = new Mongo.Collection('devicecode')
}
if (Meteor.isServer) {
DeviceCode = new Mongo.Collection('devicecode', { connection: null })
}
export default DeviceCode;
\ No newline at end of file
imports/api/methods/devicecode.js 0 → 100644
View file @ 8ffe8c66
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
import DeviceCode from '../collections/devicecode.js';
Meteor.methods({
'getDeviceCodes' () {
debugger;
this.unblock();
if (this.userId) {
try {
const result = HTTP.call('GET', `http://192.168.0.156/Broker/HISIntegration.svc/rest/getdevicecodes`);
let deviceCodeHttpResult = JSON.parse(result.content);
DeviceCode.remove({});
deviceCodeHttpResult.Devices.forEach((device) => {
DeviceCode.insert({
...device
});
});
return true
} catch (e) {
// Got a network error, timeout, or HTTP error in the 400 or 500 range.
return false;
}
}
}
});
\ No newline at end of file
imports/api/methods/worklist.js
View file @ 8ffe8c66
...@@ -12,12 +12,12 @@ import Worklist from '../collections/worklist.js'; ...@@ -12,12 +12,12 @@ import Worklist from '../collections/worklist.js';
Meteor.methods({ Meteor.methods({
'Fetchworklist' (devicemap) { 'Fetchworklist' (devicemap) {
debugger;
check(devicemap, String); check(devicemap, String);
this.unblock(); this.unblock();
if (this.userId) { if (this.userId) {
try { try {
debugger;
const result = HTTP.call('GET', `http://192.168.0.156/Broker/HISIntegration.svc/rest/Fetchworklist/${devicemap}`); const result = HTTP.call('GET', `http://192.168.0.156/Broker/HISIntegration.svc/rest/Fetchworklist/${devicemap}`);
let worklistHttp = JSON.parse(result.content); let worklistHttp = JSON.parse(result.content);
......
imports/api/server/publications/devicecode.js 0 → 100644
View file @ 8ffe8c66
import DeviceCode from '../../collections/devicecode.js';
import { check } from 'meteor/check';
Meteor.publish("devicecode", function() {
if (!this.userId) {
return this.ready();
}
return DeviceCode.find({});
});
\ No newline at end of file
package-lock.json
View file @ 8ffe8c66
This diff is collapsed.
package.json
View file @ 8ffe8c66
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"@babel/runtime": "^7.5.5", "@babel/runtime": "^7.5.5",
"bcrypt": "^3.0.6", "bcrypt": "^3.0.6",
"connect-route": "^0.1.5", "connect-route": "^0.1.5",
"fibers": "^4.0.1",
"meteor-node-stubs": "^1.0.0", "meteor-node-stubs": "^1.0.0",
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vue": "^2.6.10", "vue": "^2.6.10",
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.5.5", "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/plugin-transform-arrow-functions": "^7.2.0", "@babel/plugin-transform-arrow-functions": "^7.2.0",
"@babel/plugin-transform-async-to-generator": "^7.5.0", "@babel/plugin-transform-async-to-generator": "^7.5.0",
"@babel/plugin-transform-spread": "^7.6.2",
"@babel/preset-env": "^7.5.5", "@babel/preset-env": "^7.5.5",
"@babel/register": "^7.5.5", "@babel/register": "^7.5.5",
"@mdi/font": "^3.9.97", "@mdi/font": "^3.9.97",
...@@ -41,6 +43,8 @@ ...@@ -41,6 +43,8 @@
"file-loader": "^4.2.0", "file-loader": "^4.2.0",
"html-loader": "^0.5.5", "html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"less": "^3.10.3",
"less-loader": "^5.0.0",
"material-design-icons-iconfont": "^5.0.1", "material-design-icons-iconfont": "^5.0.1",
"sass": "^1.22.9", "sass": "^1.22.9",
"sass-loader": "^7.2.0", "sass-loader": "^7.2.0",
......
server/main.js
View file @ 8ffe8c66
...@@ -2,7 +2,9 @@ import { Meteor } from 'meteor/meteor'; ...@@ -2,7 +2,9 @@ import { Meteor } from 'meteor/meteor';
import '../imports/api/methods/worklist.js'; import '../imports/api/methods/worklist.js';
import '../imports/api/methods/changePassword.js'; import '../imports/api/methods/changePassword.js';
import '../imports/api/server/publications/worklist.js' import '../imports/api/methods/devicecode.js';
import '../imports/api/server/publications/worklist.js';
import '../imports/api/server/publications/devicecode.js';
Meteor.startup(() => { Meteor.startup(() => {
......
webpack.config.js
View file @ 8ffe8c66
...@@ -7,164 +7,167 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin'); ...@@ -7,164 +7,167 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const clientConfig = { const clientConfig = {
entry: './client/main.js', entry: './client/main.js',
// output: { // output: {
// publicPath: '/', // publicPath: '/',
// filename: 'build.js' // filename: 'build.js'
// }, // },
output: { output: {
publicPath: '/', publicPath: '/',
filename: '[name].[hash].js', filename: '[name].[hash].js',
}, },
mode: "production", mode: "production",
optimization: { optimization: {
runtimeChunk: 'single', runtimeChunk: 'single',
// minimizer: [new UglifyJsPlugin()], // minimizer: [new UglifyJsPlugin()],
// minimize: false, // minimize: false,
splitChunks: { splitChunks: {
chunks: 'all', chunks: 'all',
maxInitialRequests: Infinity, maxInitialRequests: Infinity,
minSize: 0, minSize: 0,
cacheGroups: { cacheGroups: {
vendor: { vendor: {
test: /[\\/]node_modules[\\/]/, test: /[\\/]node_modules[\\/]/,
name(module) { name(module) {
// get the name. E.g. node_modules/packageName/not/this/part.js // get the name. E.g. node_modules/packageName/not/this/part.js
// or node_modules/packageName // or node_modules/packageName
const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1]; const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
// npm package names are URL-safe, but some servers don't like @ symbols // npm package names are URL-safe, but some servers don't like @ symbols
return `npm.${packageName.replace('@', '')}`; return `npm.${packageName.replace('@', '')}`;
}, },
},
},
}, },
},
}, },
}, module: {
module: { rules: [{
rules: [ test: /\.js$/,
{ loader: 'babel-loader',
test: /\.js$/, exclude: /node_modules/
loader: 'babel-loader', },
exclude: /node_modules/ {
}, test: /\.vue$/,
{ loader: 'vue-loader',
test: /\.vue$/, options: {
loader: 'vue-loader', loaders: {}
options: { // other vue-loader options go here
loaders: {} }
// other vue-loader options go here },
} {
}, test: /\.s(c|a)ss$/,
{ use: [
test: /\.s(c|a)ss$/, 'vue-style-loader',
use: [ 'css-loader',
'vue-style-loader', {
'css-loader', loader: 'sass-loader',
{ options: {
loader: 'sass-loader', implementation: require('sass'),
options: { fiber: require('fibers'),
implementation: require('sass'), indentedSyntax: true // optional
fiber: require('fibers'), }
indentedSyntax: true // optional }
} ]
} },
] {
}, test: /\.less$/,
{ use: [
test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, 'vue-style-loader',
use: [ 'css-loader',
{ 'less-loader'
loader: 'file-loader', ]
options: { },
name: '[name].[ext]', {
outputPath: 'fonts/' test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
} use: [{
} loader: 'file-loader',
] options: {
}, name: '[name].[ext]',
{ outputPath: 'fonts/'
test: /\.css$/, }
use: [ }]
'vue-style-loader', },
'css-loader' {
], test: /\.css$/,
}, use: [
{ 'vue-style-loader',
test: /\.(png|jpg|gif|svg)$/, 'css-loader'
loader: 'file-loader', ],
options: { },
name: 'images/[name].[ext]?[hash:8]' {
} test: /\.(png|jpg|gif|svg)$/,
}, loader: 'file-loader',
{ options: {
test: /\.html$/, name: 'images/[name].[ext]?[hash:8]'
use: [ }
// { },
// loader: "file-loader", {
// options: { test: /\.html$/,
// name: "[name].html" use: [
// } // {
// }, // loader: "file-loader",
// { // options: {
// loader: "extract-loader"// tells webpack to not include html file into mainbundle js // name: "[name].html"
// }, // }
{ // },
loader: "html-loader", // {
options: { // loader: "extract-loader"// tells webpack to not include html file into mainbundle js
attrs: ["img:src"]// the src attribute in img element of html is the target // },
} {
} loader: "html-loader",
] options: {
}, attrs: ["img:src"] // the src attribute in img element of html is the target
}
}
]
},
] ]
},
resolve: {
alias: {
'vue$': 'vue/dist/vue.esm.js'
}, },
extensions: ['*', '.js', '.vue', '.json'] resolve: {
}, alias: {
externals: [meteorExternals()], 'vue$': 'vue/dist/vue.esm.js'
devServer: { },
historyApiFallback: true, extensions: ['*', '.js', '.vue', '.json']
noInfo: true, },
overlay: true, externals: [meteorExternals()],
hot: true, devServer: {
open:true historyApiFallback: true,
}, noInfo: true,
performance: { overlay: true,
hints: false hot: true,
}, open: true
devtool: 'source-map', },
plugins: [ performance: {
new webpack.HotModuleReplacementPlugin(), hints: false
new HtmlWebpackPlugin({ },
template: './client/main.html' devtool: 'source-map',
}), plugins: [
new VueLoaderPlugin() new webpack.HotModuleReplacementPlugin(),
] new HtmlWebpackPlugin({
template: './client/main.html'
}),
new VueLoaderPlugin()
]
} }
const serverConfig = { const serverConfig = {
entry: './server/main.js', entry: './server/main.js',
target: 'node', target: 'node',
externals: [meteorExternals()], externals: [meteorExternals()],
devServer: { devServer: {
hot: true, hot: true,
open:true open: true
}, },
devtool: 'source-map', devtool: 'source-map',
mode: "development", mode: "development",
module: { module: {
rules: [ rules: [{
{ test: /\.js$/,
test: /\.js$/, loader: 'babel-loader',
loader: 'babel-loader', exclude: /node_modules/
exclude: /node_modules/ }]
} }
]
}
}; };
module.exports = [clientConfig, serverConfig]; module.exports = [clientConfig, serverConfig];
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment