PHRAS-2967 #comment add warning modal for lightbox mobile #time 6h

This commit is contained in:
Harrys Ravalomanana
2020-03-10 11:50:45 +04:00
parent 746f2ae4c4
commit 5cc2de772d
15 changed files with 219 additions and 110 deletions

View File

@@ -13,5 +13,7 @@
</a>
{% endif %}
</div>
{% endif %}

View File

@@ -4,10 +4,12 @@
<script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/production/lightbox-mobile{% if not app.debug %}.min{% endif %}.js"></script>
{# <script type="text/javascript" src="/assets/lightbox/js/lightbox-mobile{% if not app.debug %}.min{% endif %}.js"></script>#}
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
{% endblock %}
{% block stylesheet %}
<link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox-mobile{% if not app.debug %}.min{% endif %}.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
{% endblock %}
{% block icon %}
@@ -62,7 +64,6 @@
</div>
</div>
<div id="about" data-role="page">
<div data-role="header">
<a href="#home" data-rel="back" data-icon="arrow-l">{{ 'Back' | trans }}</a>
@@ -99,6 +100,7 @@
{{ 'Validations' | trans }}
<span>{{_self.valid_baskets_length(baskets_collection)}}</span>
</p>
<p class="lightbox-msg">
{{ 'Voici vos validations en cours' | trans }}
</p>
@@ -168,7 +170,6 @@
</div>
</div>
<script>
var lightboxApp = lightboxMobileApplication.bootstrap({
lang: '{{ app.locale }}',

View File

@@ -4,6 +4,7 @@
{% block javascript %}
<script type="text/javascript" src="/assets/production/commons{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/production/lightbox-mobile{% if not app.debug %}.min{% endif %}.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script type="text/javascript">
{% if basket.getValidation() %}
@@ -14,13 +15,15 @@
releasable: {% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).isReleasable() %}"{{ 'Do you want to send your report ?' | trans }}"{% else %}false{% endif %}
});
//var releasable = {% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).isReleasable() %}"{{ 'Do you want to send your report ?' | trans }}"{% else %}false{% endif %}
{% endif %}
</script>
{% endblock %}
{% block stylesheet %}
<link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox-mobile{% if not app.debug %}.min{% endif %}.css" />
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
{% endblock %}
{% block content %}
@@ -41,7 +44,40 @@
{% set basket_length = basket.getElements().count() %}
{% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}
</p>
{% if basket.getValidation() %}
<div id="FeedbackRelease" class="modal fade" role="dialog" style="display: none">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">
&times;</button>
<h4 class="modal-title">{{ 'lightbox:feedback:sendreport:warnwindows:title' | trans }}</h4>
</div>
<div class="modal-body">
<p>{{'lightbox:feedback:sendreport:warnwindows:message ' | trans}}</p>
<p>{{ 'lightbox:feedback:sendreport:warnwindows:record_approved'| trans }} : <span class="record_accepted"></span>
</p>
<hr>
<p>
{{'lightbox:feedback:sendreport:warnwindows:record_rejected'| trans }} : <span class="record_refused"></span>
</p>
<hr>
<p>
{{'lightbox:feedback:sendreport:warnwindows:record_unexpressed'| trans }} : <span class="record_null"></span>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" style="width:auto">{{ 'lightbox:feedback:sendreport:warnwindows:cancel'| trans }}</button>
<button type="button" class="btn btn-primary" id="validate-release" style="width:auto">{{ 'lightbox:feedback:sendreport:warnwindows:validate'| trans }}</button>
</div>
</div>
</div>
</div>
<div class="report_wrapper">
<a id="report_summary" class="report_btn report_summary" href="#" onclick="$.ajax({
type: 'GET',
@@ -92,7 +128,11 @@
<div class="btn-container">
{% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<button class="confirm_report" style="width:100%;" title="{{ 'validation::envoyer mon rapport' | trans }}">
<button class="confirm_report" style="width:100%;" title="{{ 'validation::envoyer mon rapport' | trans }}" onclick="
">
{{ 'validation::envoyer mon rapport' | trans }}
<img src="/assets/common/images/icons/loader1F1E1B.gif" style="visibility:hidden;" class="loader"/>
</button>
@@ -100,7 +140,6 @@
</div>
</div>
</div>
{% endblock %}

View File

@@ -127,20 +127,22 @@
<h4 class="modal-title">{{ 'lightbox:feedback:sendreport:warnwindows:title' | trans }}</h4>
</div>
<div class="modal-body">
<div class="modal-content">
{{ 'lightbox:feedback:sendreport:warnwindows:record_accepted'| trans }} : <span class="record_accepted"></span>
</div>
<hr>
<div class="modal-">
{{ ' lightbox:feedback:sendreport:warnwindows:record_refused'| trans }} : <span class="record_refused"></span>
</div>
<hr>
<div class="modal-">
{{ ' lightbox:feedback:sendreport:warnwindows:record_null'| trans }} : <span class="record_null"></span>
</div>
<p>{{'lightbox:feedback:sendreport:warnwindows:message ' | trans}}</p>
<p>{{ 'lightbox:feedback:sendreport:warnwindows:record_approved'| trans }} : <span class="record_accepted"></span>
</p>
<hr>
<p>
{{'lightbox:feedback:sendreport:warnwindows:record_rejected'| trans }} : <span class="record_refused"></span>
</p>
<hr>
<p>
{{'lightbox:feedback:sendreport:warnwindows:record_unexpressed'| trans }} : <span class="record_null"></span>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">{{ 'lightbox:feedback:sendreport:warnwindows:cancel'| trans }}</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'lightbox:feedback:sendreport:warnwindows:cancel'| trans }}</button>
<button type="button" class="btn btn-primary" id="validate-release">{{ 'lightbox:feedback:sendreport:warnwindows:validate'| trans }}</button>
</div>
</div>