Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature1 #235

Open
wants to merge 148 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
26559be
Start project
acampagnaro Jun 12, 2017
99d6b91
Teste
acampagnaro Jun 13, 2017
2576ec3
Teste
acampagnaro Jun 14, 2017
6457939
Teste
acampagnaro Jun 14, 2017
c9ea1e0
Primeira fase ok
acampagnaro Jun 15, 2017
bd73730
Tudo funcionando
acampagnaro Jun 15, 2017
24f3606
Apontando para a digital ocean
acampagnaro Jun 15, 2017
a4a449f
trocado a porta
acampagnaro Jun 16, 2017
8548b21
Refresh token
acampagnaro Jun 19, 2017
54b2da8
Removendo diretorio dist
acampagnaro Jun 19, 2017
0368803
Escondendo o ícone
acampagnaro Jun 19, 2017
e848ed4
Testando
acampagnaro Jun 20, 2017
e13b6b6
Mei um pouco no login
acampagnaro Jun 20, 2017
f9e5b6d
Testando
acampagnaro Jun 21, 2017
749d0c9
Teste
acampagnaro Jun 21, 2017
4049d72
Testando
acampagnaro Jun 22, 2017
362a73d
Teste
acampagnaro Jun 23, 2017
50669a3
Testando
acampagnaro Jun 26, 2017
6abeb2d
Teste
acampagnaro Jun 26, 2017
c66d007
Modificando a api de envio então aqui muda
acampagnaro Jun 27, 2017
9ccc9ea
Testando
acampagnaro Jun 27, 2017
c2ef0ac
Teste
acampagnaro Jun 28, 2017
e627a1f
Correções
acampagnaro Jun 28, 2017
2007d41
Arrumando Crm
acampagnaro Jun 28, 2017
d4bdb6d
Nova build
acampagnaro Jun 28, 2017
32504cd
Mudando as url
acampagnaro Jun 29, 2017
7ed0741
Refatorando
acampagnaro Jun 30, 2017
0a5fed7
Graficos
acampagnaro Jun 30, 2017
b7258c5
Refatorando
acampagnaro Jul 1, 2017
e80b5c9
Adicionando moment
acampagnaro Jul 3, 2017
586a16a
Modifiado todo o vuex
acampagnaro Jul 3, 2017
0b016f4
Tentando fazer o compoente de charts
acampagnaro Jul 4, 2017
59d94bd
Tentando fazer o compoente de charts
acampagnaro Jul 4, 2017
ccdd038
build 0.1.1
acampagnaro Jul 4, 2017
03c48ca
build 0.1.1
acampagnaro Jul 4, 2017
1129fb3
Tentando fazer o compoente de charts
acampagnaro Jul 5, 2017
0d5e496
build 0.1.1
acampagnaro Jul 5, 2017
bd9d9a3
build 0.1.1
acampagnaro Jul 5, 2017
41f5b85
Finalizando 0.1.1
acampagnaro Jul 6, 2017
b73be3f
Finalizando 0.1.1
acampagnaro Jul 6, 2017
61697ea
Tentando fazer o compoente de charts
acampagnaro Jul 7, 2017
9094fb2
Tentando fazer o compoente de charts
acampagnaro Jul 7, 2017
33ba07a
Status
acampagnaro Jul 8, 2017
e966f2a
Status
acampagnaro Jul 9, 2017
2f574e3
Status
acampagnaro Jul 9, 2017
16f5faa
Status
acampagnaro Jul 10, 2017
9932026
Finalizando 0.1.1
acampagnaro Jul 10, 2017
ffc2ca7
Esta com localhost
acampagnaro Jul 10, 2017
7870ce2
Iniciando a versão 0.1.2
acampagnaro Jul 11, 2017
9b1c74e
Iniciando a versão 0.1.2
acampagnaro Jul 12, 2017
58213f6
Refatorando
acampagnaro Jul 13, 2017
9b90c9b
Iniciando a versão 0.1.2
acampagnaro Jul 13, 2017
b671240
Iniciando a versão 0.1.2
acampagnaro Jul 13, 2017
dc1bbcc
Modificando os graficos
acampagnaro Jul 13, 2017
2376e5f
Modificando os graficos
acampagnaro Jul 13, 2017
263dc72
Adicionando o nome e o email em parameters
acampagnaro Jul 14, 2017
15684d4
Adicionando o nome e o email em parameters
acampagnaro Jul 14, 2017
1762f93
Adicionando o nome e o email em parameters
acampagnaro Jul 14, 2017
b8f5bf5
Adicionando o nome e o email em parameters
acampagnaro Jul 17, 2017
6aeba4c
Refatorando
acampagnaro Jul 18, 2017
71ca5e6
Adicionando o nome e o email em parameters
acampagnaro Jul 18, 2017
40053bb
Refatorando
acampagnaro Jul 19, 2017
d24b5b7
Adicionando o nome e o email em parameters
acampagnaro Jul 19, 2017
00a30a6
Adicionando o nome e o email em parameters clinimarc
acampagnaro Jul 21, 2017
c0d74de
Adicionando o nome e o email em parameters clinimarc
acampagnaro Jul 24, 2017
201c578
Refatorando
acampagnaro Jul 25, 2017
ddc4177
Teste nos finalizados
acampagnaro Jul 25, 2017
2c97209
Teste nos finalizados
acampagnaro Jul 27, 2017
aaf164a
Teste nos finalizados
acampagnaro Jul 27, 2017
bafde50
Teste nos finalizados
acampagnaro Jul 28, 2017
6fab177
Iniciando prontuario
acampagnaro Aug 2, 2017
1a402e5
Criando pruntuario
acampagnaro Aug 3, 2017
926ac9f
Criando pruntuario
acampagnaro Aug 3, 2017
90ab23d
Refatorando muito
acampagnaro Aug 4, 2017
9956838
Adicionando o create do user
acampagnaro Aug 6, 2017
70ca8f2
Adicionando o create do user
acampagnaro Aug 7, 2017
b5e3bed
Refatorando muito
acampagnaro Aug 7, 2017
12308c6
Refatorando muito
acampagnaro Aug 8, 2017
f771e49
Adicionando o create do user
acampagnaro Aug 9, 2017
fe86dd3
Refatorando muito
acampagnaro Aug 9, 2017
b5047b0
Adicionando o create do user
acampagnaro Aug 10, 2017
2238e8a
Refatorando muito
acampagnaro Aug 10, 2017
08df398
Refatorando muito
acampagnaro Aug 11, 2017
15687d2
Adicionando o create do user
acampagnaro Aug 14, 2017
1f1304f
Refatorando muito
acampagnaro Aug 14, 2017
670d2a3
Refatorando muito
acampagnaro Aug 15, 2017
e3c30c1
Refatorando muito
acampagnaro Aug 16, 2017
5a780aa
Refatorando muito
acampagnaro Aug 16, 2017
cf8816d
Refatorando muito
acampagnaro Aug 16, 2017
380c438
Adicionado o nome do medico
acampagnaro Aug 18, 2017
611a335
Adicionado o nome do medico
acampagnaro Aug 18, 2017
baa2be3
Teste chamada de paciente
acampagnaro Aug 18, 2017
7f154fa
Teste APENAS
Aug 21, 2017
7b1c614
Mudado o endereco da API
Aug 27, 2017
b8dccb2
Deve ser passando para localhost
acampagnaro Aug 30, 2017
40f8dba
Merge branch 'master' of https://github.com/acampagnaro/vue-admin
acampagnaro Aug 30, 2017
1345328
APenas para evitar o conflito
acampagnaro Aug 30, 2017
afc6400
Passado os endereços para producao e para HTTPS
acampagnaro Sep 5, 2017
9dccb14
Passado os endereços para producao e para HTTPS
acampagnaro Sep 5, 2017
a1dd9a9
Voltei para http
acampagnaro Sep 5, 2017
43cbd70
Voltando tudo ao normal
Sep 6, 2017
5f8f1e4
So voltando o caminho para funcionar
Sep 6, 2017
1c1dd6e
Iniciando testes com es 2015
acampagnaro Sep 6, 2017
63cf882
Modificação do login
acampagnaro Sep 8, 2017
de55a7f
Merge branch 'master' of https://github.com/acampagnaro/vue-admin
acampagnaro Sep 8, 2017
a6b39f6
Modificação do login
acampagnaro Sep 9, 2017
1beda28
Criação de usuario
Sep 11, 2017
a8414f0
Merge branch 'master' of https://github.com/acampagnaro/vue-admin
Sep 12, 2017
2604654
Criação de usuario
Sep 12, 2017
8ad22e9
Criação de usuario
Sep 12, 2017
27a64b9
Iniciando testes com es 2015
acampagnaro Sep 12, 2017
fb8c2ac
Criação de usuario
Sep 13, 2017
320b6bd
Iniciando testes com es 2015
acampagnaro Sep 13, 2017
559b0ff
Criação de usuario
Sep 14, 2017
b28d58e
Iniciando testes no cadastro de usuários
acampagnaro Sep 14, 2017
d439f9a
Criação de usuario
Sep 15, 2017
450153e
Alteracoes virtual-clin
acampagnaro Sep 27, 2017
f17fc90
Itens finalizados virtual clin
Sep 27, 2017
fb69c31
Itens finalizados virtual clin
Sep 27, 2017
1e9b2be
Itens finalizados virtual clin
Sep 27, 2017
59e1fd3
Prontuario no agendamento
Sep 29, 2017
0f348d7
Finalizando virtual clin
acampagnaro Sep 30, 2017
655fcad
Colocado o servidor de testes
Oct 1, 2017
c3d78bc
Finalizando virtual clin
acampagnaro Oct 1, 2017
ed21e53
Colocado o servidor de testes
Oct 2, 2017
b8fb06a
Finalizando virtual clin
acampagnaro Oct 2, 2017
86f2276
Alteracoes virtual-clin
acampagnaro Oct 2, 2017
3eeb809
Colocado o servidor de testes
Oct 3, 2017
0f156da
Alteracoes agenda, usuario, prontuario
acampagnaro Oct 3, 2017
e3c414f
Finalizando
acampagnaro Oct 4, 2017
3b96363
Finalizando
Oct 4, 2017
1acfba5
Finalizando
acampagnaro Oct 4, 2017
8c84d2d
Finalizando
acampagnaro Oct 4, 2017
629003e
Finalizando
acampagnaro Oct 4, 2017
9546a22
Finalizando
Oct 5, 2017
ef78498
Finalizando esta com o ip de producao
acampagnaro Oct 5, 2017
660346d
Finalizando esta com o ip de localhost
acampagnaro Oct 5, 2017
d404e7b
Finalizando esta com o ip de localhost
acampagnaro Oct 5, 2017
62e0006
Refatorando usuarios
acampagnaro Oct 5, 2017
b46bbda
Finalizando
acampagnaro Oct 6, 2017
6ee3f17
Validando email
acampagnaro Oct 6, 2017
d222b34
Modificando login
Oct 7, 2017
9cfc93a
Modificado o login
Oct 7, 2017
2ba554c
Finalizando 2.0
acampagnaro Oct 8, 2017
f387814
Modificado o login
Oct 8, 2017
840c463
Login estava errado o maior e menor
acampagnaro Oct 10, 2017
d0f1e20
Iniciando a alteracao para o usuario tem muitos clientes
Oct 14, 2017
f8098a2
Alteracoes no login
acampagnaro Oct 16, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ module.exports = {
plugins: [
'html'
],
global : {
$: true,
jQuery: true
},
// add your custom rules here
'rules': {
// allow paren-less arrow functions
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ yarn-error.log
selenium-debug.log
test/unit/coverage
test/e2e/reports
.idea
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,5 @@ Become a sponsor and get your logo on our README on Github with a link to your s
[Bulma]: http://bulma.io
[Vue-bulma]: https://github.com/vue-bulma

ip do servidor online do http: 104.131.75.202
ip do servidor api: 45.32.167.85
2 changes: 1 addition & 1 deletion build/webpack.dev.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = merge(baseWebpackConfig, {
}),
// https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({
title: 'Vue Admin',
title: 'Dashboard - Beta',
filename: 'index.html',
template: 'index.html',
inject: true,
Expand Down
2 changes: 1 addition & 1 deletion build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const webpackConfig = merge(baseWebpackConfig, {
// you can customize output by editing /index.html
// see https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({
title: 'Vue Admin',
title: 'RISC Dashboard',
filename: process.env.NODE_ENV === 'testing'
? 'index.html'
: config.build.index,
Expand Down
2 changes: 2 additions & 0 deletions client/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export default {
animation-duration: .377s;
}

// @import '~material-icons/material-icons.css';

@import '~bulma';

@import '~wysiwyg.css/wysiwyg.sass';
Expand Down
12 changes: 10 additions & 2 deletions client/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ import router from './router'
import store from './store'
import * as filters from './filters'
import { TOGGLE_SIDEBAR } from 'vuex-store/mutation-types'
import database from './pluguins/firebase'
import API_URL from '../config/dev.env'
import VModal from 'vue-js-modal'

console.log(process.env.NODE_ENV)

Vue.router = router
Vue.use(VueAxios, axios)
Vue.use(VModal, { dialog: true })
Vue.use(VueAxios, axios, VModal)
Vue.use(VueAuth, {
auth: {
request: function (req, token) {
Expand All @@ -24,10 +30,12 @@ Vue.use(VueAuth, {
},
http: require('@websanova/vue-auth/drivers/http/axios.1.x.js'),
router: require('@websanova/vue-auth/drivers/router/vue-router.2.x.js'),
loginData: { url: 'http://localhost:6789/login', fetchUser: false },
loginData: { url: API_URL.API_URL + '/users/login', fetchUser: false },
refreshData: { enabled: false }
})

Vue.use(database)

Vue.use(NProgress)

// Enable devtools
Expand Down
Binary file added client/assets/404-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/logo1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/logo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/logo4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/logo_RISC.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions client/components/charts/Charts.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<template>
<div id="chartTipo"></div>
</template>

<script>
import Highcharts from 'highcharts'

export default {
name: 'Chart',
mounted () {
this.setup()
},
props: ['categories', 'value'],
methods: {
setup (categories, value) {
console.log(this.categories)
Highcharts.chart('chartTipo', {
chart: {
plotBackgroundColor: null,
plotBorderWidth: null,
plotShadow: false,
type: 'pie'
},
title: {
text: 'Browser market shares January, 2015 to May, 2015'
},
tooltip: {
pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
},
plotOptions: {
pie: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels: {
enabled: true,
format: '<b>{point.name}</b>: {point.percentage:.1f} %',
style: {
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
}
}
}
},
series: [{
name: 'Brands',
colorByPoint: true,
data: [{
name: 'IE',
y: 56.33
}, {
name: 'Chrome',
y: 24.03,
sliced: true,
selected: true
}, {
name: 'Firefox',
y: 10.38
}, {
name: 'Safari',
y: 4.77
}, {
name: 'Opera',
y: 0.91
}, {
name: 'Proprietary or Undetectable',
y: 0.2
}]
}]
})
}
}
}
</script>
72 changes: 72 additions & 0 deletions client/components/charts/exam/AgreementColumn.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<template>
<div id="graficoConvenios"></div>
</template>

<script>
import Highcharts from 'highcharts'
import { mapGetters, mapState } from 'vuex'
import _ from 'lodash'

export default {
name: 'Charts-Convenios',
computed: {
...mapState({
list: state => state.scheduleList
}),
...mapGetters({
scheduleList: 'scheduleList'
})
},
props: ['categories', 'value'],
watch: {
list () {
this.dataSource()
}
},
methods: {
dataSource () {
const convenios = !this.scheduleList ? [] : this.scheduleList.map(item => item.tbConvenio)
const data = convenios.filter(function (element) {
return element !== undefined
})
const base = _(data)
.countBy()
.map((value, key) => ({ key, value }))
.orderBy(['value'], ['desc'])
.value()
const categories = base.map(item => item.key)
const values = base.map(item => item.value)
this.setup({ categories, values })
},
setup (obj) {
const { categories, values } = obj
Highcharts.chart('graficoConvenios', {
chart: {
type: 'column'
},
title: {
text: 'Convênios'
},
subtitle: {
text: 'Fonte: Risc Sistemas em Saúde'
},
xAxis: {
categories: categories,
crosshair: true
},
yAxis: {
min: 0,
title: {
text: 'Quantidade'
}
},
series: [{
name: 'Quantidade',
data: values

}]
})
}
}
}
</script>
88 changes: 88 additions & 0 deletions client/components/charts/exam/ExamPie.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<template>
<div class="">
<div id="chartExamesDone"></div>
</div>
</template>

<script>
import Highcharts from 'highcharts'
import { mapState } from 'vuex'
import _ from 'lodash'

export default {
name: 'Charts-Exam',
computed: mapState({
list: state => state.examsDoneList
}),
props: ['categories', 'value'],
watch: {
list () {
this.dataSource()
}
},
methods: {
dataSource () {
if (this.list === undefined) {
return
}
const convenios = this.list.map(item => item.tbConvenio)
const data = convenios.filter(function (element) {
return element !== undefined
})
const base = _(data)
.countBy()
.map((y, name) => ({ y, name }))
.orderBy(['y'], ['desc'])
.value()

const subset = base.slice(0, 5)

const total = subset.reduce((acc, item) => {
return acc + item.y
}, 0)

const finalData = subset.map(item => {
item.y = (item.y / total) * 100
return item
})

this.setup({ finalData })
},
setup (obj) {
const { finalData } = obj
Highcharts.chart('chartExamesDone', {
chart: {
plotBackgroundColor: null,
plotBorderWidth: null,
plotShadow: false,
type: 'pie'
},
title: {
text: 'Convênios'
},
tooltip: {
pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
},
plotOptions: {
pie: {
allowPointSelect: true,
cursor: 'pointer',
dataLabels: {
enabled: true,
format: '<b>{point.name}</b>: {point.percentage:.1f} %',
style: {
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
}
}
}
},
series: [{
name: 'Brands',
colorByPoint: true,
data: finalData
}]
})
}
}
}
</script>
Loading