Skip to content

Commit

Permalink
Checks if mongodb is available
Browse files Browse the repository at this point in the history
  - closes #320
  - closes #321
  - closes #317
  - closes #326
  • Loading branch information
davidCarlos committed Jun 29, 2021
1 parent f19ea2a commit 78d8b0e
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 42 deletions.
1 change: 0 additions & 1 deletion lib/scss/components/_analysis.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
text-align: center;
width: 60%;
margin: auto;

}

.requirements-to-collect {
Expand Down
61 changes: 33 additions & 28 deletions locale/pt_BR/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ej\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-21 12:31-0300\n"
"POT-Creation-Date: 2021-06-29 14:25-0300\n"
"PO-Revision-Date: 2019-09-09 13:55-0300\n"
"Last-Translator: Fábio Mendes <[email protected]>\n"
"Language-Team: Brazilian Portuguese\n"
Expand Down Expand Up @@ -2346,77 +2346,82 @@ msgid "Execution environment"
msgstr "Ambiente de execução"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:4
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:81
msgid ""
"Welcome to EJ analysis area. Here we presents data crossing between EJ and "
"other tools, like Analytics and Mautic. Before starting collecting, it is "
"necessary to check if this conversation is available to data crossing. Read "
"more on our documentation."
msgstr ""
"Bem vinda a área de análises da EJ. Aqui apresentamos o cruzamento de dados "
"da EJ com outras fontes, como Analytics e Mautic. Antes de iniciar a coleta "
"dos dados, é necessário verificar se essa conversa está apta para o "
"cruzamento. Leia mais na nossa documentação."

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:5
msgid "Could not connect to analysis database, try later"
msgstr "Não foi possível conectar no banco de análises, tente mais tarde"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:10
msgid "Engagement vs Aquisition"
msgstr "Engajamento vs Aquisição"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:13
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:19
#, fuzzy
msgid "Start date"
msgstr "data de inicio"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:17
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:23
msgid "End date"
msgstr "data de fim"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:22
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:28
msgid "Analytics view id"
msgstr "view id do analytics"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:26
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:32
msgid "utm_source"
msgstr ""

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:33
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:39
#, fuzzy
msgid "utm_campaign"
msgstr "Campanha de email"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:40
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:46
msgid "utm_medium"
msgstr ""

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:65
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:71
msgid "Invalid analytics view id"
msgstr "view id do analytics invalida"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:68
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:74
msgid "end date must be gratter then start date"
msgstr "data de fim deve ser maior que data de inicio"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:75
msgid ""
"Welcome to EJ analysis area. Here we presents data crossing between EJ and "
"other tools, like Analytics and Mautic. Before starting collecting, it is "
"necessary to check if this conversation is available to data crossing. Read "
"more on our documentation."
msgstr ""
"Bem vinda a área de análises da EJ. Aqui apresentamos o cruzamento de dados "
"da EJ com outras fontes, como Analytics e Mautic. Antes de iniciar a coleta "
"dos dados, é necessário verificar se essa conversa está apta para o "
"cruzamento. Leia mais na nossa documentação."

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:76
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:82
msgid "Trigger Collect"
msgstr "Iniciar coleta"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:78
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:84
msgid ""
"Please inform analytics property ID from the page, and clink to start "
"collecting"
msgstr ""
"Por favor, informe o identificador do analytics para a pagina monitorada, "
"e clique em iniciar."
"Por favor, informe o identificador do analytics para a pagina monitorada, e "
"clique em iniciar."

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:82
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:88
#, fuzzy
msgid "Start"
msgstr "Iniciar"

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:129
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:132
msgid "Total access to component (engagement): "
msgstr "Total de acessos ao componente (engajamento): "

#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:131
#: src/ej_analysis/jinja2/ej_conversations_analysis/aquisition.jinja2:134
#, fuzzy
msgid "Total voters on component (aquisition): "
msgstr "Total de participantes na conversa (aquisição): "
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<div class="row">
{% if mongodb_timeout %}
<div class="empty-viz">
<p>{{ _('Welcome to EJ analysis area. Here we presents data crossing between EJ and other tools, like Analytics and Mautic. Before starting collecting, it is necessary to check if this conversation is available to data crossing. Read more on our documentation.')}}.</p>
<p class="pad-x3 rounded-3 color-negative border-1">{{ _('Could not connect to analysis database, try later')}}.</p>
</div>
{% endif %}
{% if data_exists %}
<div class="card">
<div class="card-title">{{ _('Engagement vs Aquisition') }} </div>
Expand Down Expand Up @@ -70,7 +76,7 @@
</div>
</div>
</div>
{% else %}
{% elif ( not data_exists and not mongodb_timeout) %}
<div class="empty-viz">
<p>{{ _('Welcome to EJ analysis area. Here we presents data crossing between EJ and other tools, like Analytics and Mautic. Before starting collecting, it is necessary to check if this conversation is available to data crossing. Read more on our documentation.')}}.</p>
<input onClick="showRequirementsToStartCollecting()" name="trigger-collect" type="button" value="{{ _('Trigger Collect')}}">
Expand Down
27 changes: 15 additions & 12 deletions src/ej_analysis/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,21 @@
@urlpatterns.route(conversation_analysis_url)
def index(request, conversation, slug):
mongodb_wrapper = MongodbWrapper(conversation.id)
if mongodb_wrapper.conversation_data_exists():
utm_source_options = mongodb_wrapper.get_utm_sources()
utm_campaign_options = mongodb_wrapper.get_utm_campaigns()
utm_medium_options = mongodb_wrapper.get_utm_medium()
return {
"conversation": conversation,
"utm_source_options": utm_source_options,
"utm_campaign_options": utm_campaign_options,
"utm_medium_options": utm_medium_options,
"data_exists": True,
}
return {"data_exists": False, "conversation": conversation}
try:
if mongodb_wrapper.conversation_data_exists():
utm_source_options = mongodb_wrapper.get_utm_sources()
utm_campaign_options = mongodb_wrapper.get_utm_campaigns()
utm_medium_options = mongodb_wrapper.get_utm_medium()
return {
"conversation": conversation,
"utm_source_options": utm_source_options,
"utm_campaign_options": utm_campaign_options,
"utm_medium_options": utm_medium_options,
"data_exists": True,
}
return {"mongodb_timeout": False, "data_exists": False, "conversation": conversation}
except:
return {"mongodb_timeout": True, "data_exists": False, "conversation": conversation}


@urlpatterns.route(conversation_analysis_url_aquisition_viz)
Expand Down

0 comments on commit 78d8b0e

Please sign in to comment.