Commit 33d57eda authored by Bianca Carlsen's avatar Bianca Carlsen
Browse files

Merge branch 'dev' into dev-bia

parents 15b32800 fe2d43ca
......@@ -114,7 +114,7 @@ export default {
}
} else
// Área de parceiro ou admin (MEC). Requer associação a um parceiro.
// Área do Parceiro ou admin (MEC). Requer associação a um parceiro.
if (routeTree.some(record => record.meta.role == 'partner')) {
if ((user.role != 'partner' && user.role != 'admin') || !user.partner) {
this.$router.push('/nao-autorizado');
......
<template>
<div id="cardSelectMaterial">
<div
id="cardSelectMaterial"
:class="selecionado !== undefined ? 'bg-03 rounded-borders shadow-1 q-mb-xs' : ''">
<div class="px-3">
<div class="row text-01 q-py-sm">
<div class="col-1">
<template
v-if="selecionado !== undefined">
<p class="p-style text-primary-color font-weight-900 text-center q-mt-sm">
{{ selecionado + 1 }}
</p>
</template>
<q-checkbox
v-else
v-model="selecionar"
class="text-02"
color="deep-purple-6" />
</div>
<div class="col-9">
<div class="col-9 q-pl-md">
<p class="p-x_small mb-1 font-weight-700 text-uppercase text-material-color">
MATERIAL DE FORMAÇÃO
</p>
......@@ -24,21 +34,21 @@
<q-icon
name="schedule"
class="text-material-color"
style="font-size: 1.3em"
/>
style="font-size: 1.3em" />&nbsp;
{{ data.dedication_time }}h
</span>
</p>
</div>
</div>
</div>
<q-separator></q-separator>
<q-separator
v-if="selecionado === undefined" />
</div>
</template>
<script>
export default {
props: ["data", "materiaisSelecionados"],
props: ["data", "materiaisSelecionados", "selecionado"],
data() {
return {
......@@ -47,12 +57,14 @@ export default {
},
mounted() {
if (this.materiaisSelecionados.length > 0) {
this.materiaisSelecionados.forEach((element) => {
if (element.id == this.data.id) {
this.selecionar = true;
}
});
if (this.materiaisSelecionados) {
if (this.materiaisSelecionados.length > 0) {
this.materiaisSelecionados.forEach((element) => {
if (element.id == this.data.id) {
this.selecionar = true;
}
});
}
}
},
......
......@@ -22,7 +22,7 @@
</div> -->
<!-- #davi <div class="col-md-10"> -->
<div class="col-md-12">
<div class="col-12">
<div class="row">
<!-- #davi <div class="col-md-3 q-pl-md"> -->
......
......@@ -6,29 +6,33 @@
<p class="text-weight-bolder d-inline-block">{{ tratarTipo() }}</p>
</div>
<div class="col-6 text-right">
<q-btn v-if="mostrarBotaoEstatisticas" round flat icon="more_vert" color="grey">
<q-btn
v-if="mostrarBotoesMeta || !mobile"
round
flat
icon="more_vert"
color="grey">
<q-menu>
<q-list class="text-01 p-small" style="min-width: 100px">
<q-item
v-if="
tipo == 'trilha' || tipo == 'material' || tipo == 'formacao-externa'
"
@click="
$router.push(
`/admin/parceiro/estatisticas-individuais/${tipo}/${item.id}/estatisticas`
)
"
v-if="mostrarBotoesMeta"
:to="`/admin/parceiro/estatisticas-individuais/${tipo}/${item.id}/estatisticas`"
clickable
v-close-popup
>
v-close-popup>
<q-item-section>Estatísticas</q-item-section>
</q-item>
<q-item
v-if="mostrarBotoesMeta"
:to="`/admin/parceiro/estatisticas-individuais/${tipo}/${item.id}/problemas`"
clickable
v-close-popup>
<q-item-section>Problemas</q-item-section>
</q-item>
<q-item
v-if="!mobile"
clickable
v-close-popup
@click="$emit('editar', item.id)"
>
@click="$emit('editar', item.id)">
<q-item-section>Editar</q-item-section>
</q-item>
<template v-if="tipo == 'material' && !mobile && item['evaluation-defs']">
......@@ -36,8 +40,7 @@
<q-item
clickable
v-close-popup
@click="$emit('editarAvaliacao', item)"
>
@click="$emit('editarAvaliacao', item)">
<q-item-section>Editar avaliação</q-item-section>
</q-item>
</template>
......@@ -49,16 +52,14 @@
<div class="col-12">
<h3
:class="mobile ? '' : 'size-height-title'"
class="h3-style text-01 mb-2 mt-0 pr-3"
>
class="h3-style text-01 mb-2 mt-0 pr-3">
{{ item.title }}
</h3>
<p
@mouseover="hover = true"
@mouseleave="hover = false"
v-if="!mobile"
class="p-small text-02 pt-2 pr-3"
>
class="p-small text-02 pt-2 pr-3">
<template v-if="tipo !== 'avaliação'">
<template v-if="item.subtitle">
<template v-if="!hover">
......@@ -81,7 +82,10 @@
</p>
</div>
<div v-if="tipo !== 'avaliação'" class="col-3 mt-3 pr-2">
<div
v-if="tipo !== 'avaliação'"
class="mt-3 pr-2"
:class="!mobile && item.materials ? 'col-5' : 'col-12'">
<span class="p-small text-01">
<q-icon size="22px" :class="corTextClass" class="mr-1" name="access_time" />
<b>
......@@ -89,8 +93,10 @@
</b>
</span>
</div>
<div v-if="!mobile" class="col-6 mt-3">
<span v-if="item.materials" class="p-small text-01">
<div
v-if="!mobile && item.materials"
class="col-7 mt-3">
<span class="p-small text-01">
<b>
<q-icon size="22px" :class="corTextClass" class="mr-1" name="folder_open" />
{{ item.materials.length }} Materiais
......@@ -99,16 +105,14 @@
</div>
<div
v-if="tipo !== 'avaliação'"
class="col-md-12 col-sm-12 col-xs-12 text-right mt-3 py-2"
>
class="col-12 text-right mt-3 py-2">
<q-btn
:to="`/${tipo}/${this.item.id}`"
rounded
outline
:label="'Ver ' + tratarTipo()"
:class="corTextClass"
class="p-1 mr-3 full-width h4-style text-overline"
/>
class="p-1 mr-3 full-width h4-style text-overline" />
</div>
</div>
</q-card>
......@@ -127,7 +131,7 @@ export default {
return {
mobile: false,
hover: false,
mostrarBotaoEstatisticas: true,
mostrarBotoesMeta: true,
};
},
......@@ -136,17 +140,13 @@ export default {
this.mobile = true;
}
if (this.mobile) {
if (
this.tipo == "trilha" ||
this.tipo == "material" ||
this.tipo == "formacao-externa"
) {
this.mostrarBotaoEstatisticas = true;
} else {
// se for doc, legisl ou public
this.mostrarBotaoEstatisticas = false;
}
this.mostrarBotoesMeta = false;
switch (this.tipo) {
case 'trilha':
case 'material':
case 'formacao-externa':
this.mostrarBotoesMeta = true;
break;
}
},
......
......@@ -36,7 +36,8 @@
rounded
@click="sendFeedback(+1)"
:loading="loadingFeedback"
class="text-primary-color q-ml-lg"
class="q-ml-lg"
:class="data.liked == 1 ? 'text-primary-color' : 'text-03'"
icon="thumb_up"
label="Sim" />
<q-btn
......@@ -44,7 +45,7 @@
rounded
@click="sendFeedback(-1)"
:loading="loadingFeedback"
class="text-03"
:class="data.liked == -1 ? 'text-primary-color' : 'text-03'"
icon="thumb_down"
label="Não" />
</q-card-actions>
......@@ -82,10 +83,14 @@ export default {
},
sendFeedback(score) {
score = (this.data.liked != score ? score : 0);
this.loadingFeedback = true;
this.$axios
.post(`/faqs/${this.data.id}/like`, { value: score })
.then((res) => {
this.data.liked = score;
this.$q.notify({
icon: "announcement",
color: "positive",
......
......@@ -12,9 +12,9 @@
<q-list class="text-01 p-small" style="min-width: 100px">
<q-item clickable v-close-popup>
<q-item-section
@click="user ? showModal() : (modalLoginCadastro = true)"
>Adicionar a um percurso</q-item-section
>
@click="user ? showModal() : (modalLoginCadastro = true)">
Adicionar a um percurso
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item-section
......@@ -23,19 +23,19 @@
? $emit('salvar', material.id)
: (modalLoginCadastro = true)
"
>Salvar</q-item-section
>
>
Salvar
</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</div>
<div class="col-md-12">
<div class="col-12">
<h3
:class="mobile ? '' : 'size-height-title'"
class="h3-style text-01 mb-2 mt-0 pr-3 "
>
class="h3-style text-01 mb-2 mt-0 pr-3 ">
{{ material.headline ? material.headline : material.title }}
</h3>
......@@ -43,8 +43,7 @@
@mouseover="hover = true"
@mouseleave="hover = false"
v-if="!mobile"
class="p-small text-02 pt-2 pr-3 "
>
class="p-small text-02 pt-2 pr-3 ">
<template v-if="material.subtitle">
<template v-if="!hover">
{{
......@@ -73,8 +72,7 @@
material.dedication_time
? material.dedication_time + "h"
: "Não informado"
}}</b></span
>
}}</b></span>
</div>
<div class="col-md-12 col-sm-12 col-xs-12 text-right mt-3 py-2">
......@@ -83,8 +81,7 @@
rounded
outline
label="Ver Material"
class="text-material-color p-1 mr-3 full-width h4-style text-overline"
/>
class="text-material-color p-1 mr-3 full-width h4-style text-overline" />
</div>
</div>
</q-card>
......@@ -112,8 +109,7 @@
<q-dialog v-model="modalLoginCadastro">
<q-card
style="min-width: 945px !important"
class="p-4 card-modal-add-percurso"
>
class="p-4 card-modal-add-percurso">
<div class="row">
<div class="col-12 text-right">
<q-btn
......@@ -121,13 +117,12 @@
round
flat
icon="close"
color="grey"
/>
color="grey" />
</div>
</div>
<div class="row text-center">
<div class="col-12">
<LogarCadastrar></LogarCadastrar>
<LogarCadastrar />
</div>
</div>
</q-card>
......
......@@ -23,7 +23,7 @@
</q-menu>
</q-btn>
</div>
<div class="col-md-12">
<div class="col-12">
<h3
:class="mobile ? '' : 'size-height-title'"
class="h3-style text-01 mb-2 mt-0 pr-3 "
......
......@@ -124,7 +124,7 @@
v-if="material.partner_show"
class="row q-mt-lg"
:class="!mobile ? 'q-pl-lg' : 'q-pl-sm'">
<div class="col-md-12">
<div class="col-12">
<h4 class="h4-style text-01 q-mt-none">
OFERECIDO POR:
</h4>
......
......@@ -28,7 +28,7 @@
<div class="d-table-cell text-center">
<p class="p-small font-weight-700 q-my-none">
<span
v-if="data.quality_survey"
v-if="data.evaluation_defs_count > 0"
class="q-mr-xl">
<q-icon
name="fact_check"
......
......@@ -2,15 +2,15 @@
<div>
<q-card id="cardSobre" class="my-card">
<q-img
alt="Ilustração"
:src="require('../../../src/assets/imgs/sobre/cards/' + item.img)"
/>
:alt="item.alt" />
<div class="row text-center">
<div class="col-12 pb-3">
<h3 class="mt-3 mb-2 h3-style text-01">{{ item.titulo }}</h3>
<p class="p-small text-02 px-5 height-fixo mt-3">
{{ item.descricao }}
</p>
<q-btn
flat
rounded
......
<template>
<div class="avaliacao-expansivel">
<q-expansion-item
v-model="expanded"
:expand-icon-toggle="!mobile"
:expand-icon-class="!mobile ? 'd-none' : 'text-material-color'"
class="bg-01 custom-rounded-borders shadow-1">
<template v-slot:header>
<q-item-section>
<div
class="row"
:class="!mobile ? 'q-pt-sm' : 'q-py-sm'">
<div class="col-9">
<h4
class="text-material-color text-uppercase q-mt-none q-mb-xs"
:class="!mobile ? 'h4-style' : 'p-xx_small text-bold'">
Material
</h4>
<p
class="text-bold q-mb-none ellipsis"
:class="!mobile ? 'p-big' : 'p-small'">
Criança e infância: conceituação e campos de estudo
</p>
</div>
<div class="col-3 text-right mobile-hide">
<q-btn
rounded
outline
class="h4-style text-primary-color text-overline q-mt-sm"
label="Começar atividade"/>
</div>
</div>
</q-item-section>
</template>
<q-card
:class="{'border-top': mobile}">
<q-card-section class="row">
<div class="col-md-4 col-sm-12 col-xs-12">
<q-icon
name="fact_check"
:style="!mobile ? 'font-size: 3.5em' : 'font-size: 2em'"
class="text-positive q-mr-md" />
<p
class="d-inline"
:class="!mobile ? 'p-small text-bold' : 'p-x_small'">
Atividade Concluída
</p>
</div>
<div class="col-md-4 col-sm-12 col-xs-12">
<h4
class="text-material-color text-uppercase d-inline-block"
:class="!mobile ? 'h4-style q-mt-lg q-mr-lg' : 'p-xx_small text-bold q-mt-md q-mr-md'">
Aproveitamento
</h4>
<h3
class="d-inline-block q-my-none"
:class="!mobile ? 'h3-style' : 'p-style text-bold'">
7,0
</h3>
</div>
<div class="col-md-4 col-sm-12 col-xs-12">
<h4
class="text-material-color text-uppercase d-inline-block"
:class="!mobile ? 'h4-style q-mt-lg q-mr-lg' : 'p-xx_small text-bold q-mt-md q-mr-md'">
Requerimento mínimo
<q-icon
name="info_outline"
:size="!mobile ? '1.1em' : '1.3em'"
class="text-grey cursor-pointer q-mb-xs">
<q-tooltip
content-class="text-01 bg-01 shadow-4"
content-style="font-size: 14px; width: 240px">
Um dos requirementos para emitir a declaração é o
aproveitamento minímo na atividade avaliativa.
</q-tooltip>
</q-icon>
</h4>
<p
class="d-inline-block q-mt-none"
:class="!mobile ? 'p-style' : 'p-small font-weight-700'">
5/10
</p>
</div>
<div class="col-12 mobile-only">
<q-btn
rounded
outline
class="h4-style text-primary-color text-overline full-width"
label="Começar atividade"/>
</div>
</q-card-section>
</q-card>
</q-expansion-item>
</div>
</template>
<script>
import { Platform } from "quasar";
export default {
props: ["data"],
data() {
return {
mobile: false,
expanded: true
};
},
mounted() {
if (Platform.is.mobile) {
this.mobile = true;
this.expanded = false;
}
}
};
</script>
<style>
.avaliacao-expansivel .custom-rounded-borders {
border-radius: .5em;
}
.avaliacao-expansivel .border-top {
border-top: 1px solid var(--ui-01);
}
/* auto contraste */
body.body--dark .avaliacao-expansivel .shadow-1 {
box-shadow:
0 1px 3px rgb(255 255 255 / 20%),
0 1px 1px rgb(255 255 255 / 14%),
0 2px 1px -1px rgb(255 255 255 / 12%);
}
body.body--dark .avaliacao-expansivel .text-material-color,
body.body--dark .avaliacao-expansivel .text-positive {
color: var(--text-01) !important;
}
body.body--dark .avaliacao-expansivel .q-item--clickable .text-material-color > .q-icon {
color: var(--link-color--accessibility);
}
</style>
......@@ -6,8 +6,7 @@
<slide
class="mr-3 size"
v-for="(item, index) in saibaMais"
:key="index"
>
:key="index">
<CardSobre :item="item"></CardSobre>
</slide>
<slide class="mr-3 size"> </slide>
......@@ -20,6 +19,7 @@
<script>
import CardSobre from "components/cards/cardSobre";
export default {
props: ["saibaMais"],
components: {
......
......@@ -2,10 +2,14 @@
<div id="filtroTitle">
<div class="row">
<div
class="col-md-4 col-xs-5 col-sm-4 q-pr-md"
:class="!mobile ? 'text-right' : 'text-left'">
class="q-pr-md"
:class="
(!versaoVertical ? 'col-md-4 col-xs-5 col-sm-4 ' : 'col-12 d-block ') +
(mobile || versaoVertical ? 'text-left' : 'text-right')
">
<p
class="p-style text-01 text-bold q-mb-sm">
class="p-style text-01 text-bold"
:class="!versaoVertical ? 'q-mb-sm' : 'q-mb-none'">
{{ !versaoComCpf ? 'Buscar:' : 'Buscar por:' }}
</p>
......@@ -25,17 +29,23 @@
option-label="name" />
</div>
<div class="col-md-8 col-xs-7 col-sm-8 relative-position">