all basic functionnalities working fine

This commit is contained in:
osaajani 2019-11-10 17:32:59 +01:00
parent 1dfebd1df7
commit bb6f755ef2
21 changed files with 53 additions and 54 deletions

View file

@ -128,9 +128,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -89,9 +89,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -87,9 +87,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -153,7 +153,7 @@
<tbody>
<?php foreach ($sendeds as $sended) { ?>
<tr>
<td><?php $this->s($sended['target']); ?></td>
<td><?php $this->s($sended['destination']); ?></td>
<td><?php $this->s($sended['at']); ?></td>
</tr>
<?php } ?>
@ -190,7 +190,7 @@
<tr>
<td><?php $this->s($received['origin']); ?></td>
<td><?php $this->s($received['at']); ?></td>
<td><?php echo ($received['is_command']) ? 'Oui' : 'Non'; ?></td>
<td><?php echo ($received['command']) ? 'Oui' : 'Non'; ?></td>
</tr>
<?php } ?>
</tbody>

View file

@ -47,7 +47,7 @@
</thead>
<tbody>
<?php foreach ($discussions as $discussion) { ?>
<tr class="goto" url="<?php $this->s(\Router::url('Discussion', 'show', ['number' => $discussion['number']])); ?>">
<tr class="goto" url="<?php $this->s(\descartes\Router::url('Discussion', 'show', ['number' => $discussion['number']])); ?>">
<td><?php $this->s($discussion['at']); ?></td>
<td><?php $this->s(isset($discussion['contact']) ? $discussion['contact'] . ' (' . $discussion['number'] . ')' : $discussion['number']); ?></td>
</tr>

View file

@ -36,8 +36,8 @@
</div>
<div class="col-lg-12 message-input-container">
<div class="discussion-message message-input">
<form class="send-message-discussion" action="<?php $this->s(\Router::url('Discussion', 'send', ['csrf' => $_SESSION['csrf']])); ?>" method="POST">
<textarea name="content" placeholder="Envoyer un message..."></textarea>
<form class="send-message-discussion" action="<?php $this->s(\descartes\Router::url('Discussion', 'send', ['csrf' => $_SESSION['csrf']])); ?>" method="POST">
<textarea name="text" placeholder="Envoyer un message..."></textarea>
<input type="hidden" name="numbers[]" value="<?php $this->s($number); ?>" />
<button class="btn" ><span class="fa fa-fw fa-send-o"></span> Envoyer</button>
</form>
@ -58,7 +58,7 @@
function getmessages ()
{
ajaxTransactionId = Date.now();
jQuery.getJSON(HTTP_PWD + "/discussions/getmessages/<?php echo htmlspecialchars(urlencode($number)); ?>/" + ajaxTransactionId , function( data ) {
jQuery.getJSON(HTTP_PWD + "/discussion/getmessage/<?php echo htmlspecialchars(urlencode($number)); ?>/" + ajaxTransactionId , function( data ) {
if (data.transaction_id != ajaxTransactionId)
{

View file

@ -98,9 +98,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -87,9 +87,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -97,9 +97,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -87,9 +87,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -110,9 +110,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -178,9 +178,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -93,9 +93,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -81,9 +81,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});

View file

@ -62,7 +62,7 @@
</div>
<div class="text-right col-xs-6 no-padding">
<strong>Action pour la séléction :</strong>
<div class="btn-groupe action-dropdown" target="#table-webhooks">
<div class="btn-groupe action-dropdown" destination="#table-webhooks">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action pour la sélection <span class="caret"></span></button>
<ul class="dropdown-menu pull-right" role="menu">
<li><a href="<?php echo \descartes\Router::url('webhooks', 'edit', [$_SESSION['csrf']]); ?>"><span class="fa fa-edit"></span> Modifier</a></li>
@ -84,9 +84,9 @@
jQuery('.action-dropdown a').on('click', function (e)
{
e.preventDefault();
var target = jQuery(this).parents('.action-dropdown').attr('target');
var destination = jQuery(this).parents('.action-dropdown').attr('destination');
var url = jQuery(this).attr('href');
jQuery(target).find('input:checked').each(function ()
jQuery(destination).find('input:checked').each(function ()
{
url += '/' + jQuery(this).val();
});