Skip to content

Commit 120adad

Browse files
maulapimaulapi
authored
Merge branch 'master' into add-module-ubicaz
2 parents 6f5f172 + a00b3ab commit 120adad

47 files changed

Lines changed: 877 additions & 548 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ajax.php‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
$results[] = [
119119
'id' => $hook->id,
120120
'name' => $hook->name,
121+
'content' => $hook->response(),
121122
];
122123
}
123124
}
@@ -126,37 +127,6 @@
126127

127128
break;
128129

129-
case 'hook-lock':
130-
$hook_id = filter('id');
131-
$hook = Hook::find($hook_id);
132-
133-
$token = $hook->lock();
134-
135-
echo json_encode($token);
136-
137-
break;
138-
139-
case 'hook-execute':
140-
$hook_id = filter('id');
141-
$token = filter('token');
142-
$hook = Hook::find($hook_id);
143-
144-
$response = $hook->execute($token);
145-
146-
echo json_encode($response);
147-
148-
break;
149-
150-
case 'hook-response':
151-
$hook_id = filter('id');
152-
$hook = Hook::find($hook_id);
153-
154-
$response = $hook->response();
155-
156-
echo json_encode($response);
157-
158-
break;
159-
160130
case 'flash':
161131
$response = flash()->getMessages();
162132

‎assets/src/css/style.css‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,17 @@ input.small-width {
10451045
text-decoration: none;
10461046
}
10471047

1048+
.img-circle.square {
1049+
box-shadow: 0px 0px 1px 1px lightgray;
1050+
}
1051+
10481052
.dropdown-menu {
10491053
min-width: 130px;
10501054
}
10511055

1052-
.img-circle.square {
1053-
box-shadow: 0px 0px 1px 1px lightgray;
1056+
#hooks .dropdown-item {
1057+
white-space: normal;
1058+
min-width: max-content;
10541059
}
10551060

10561061
.select2-dropdown {
@@ -2564,9 +2569,20 @@ section.content, .main-footer {
25642569
}
25652570
}
25662571

2572+
.modal-body {
2573+
padding: 15px 20px;
2574+
}
2575+
2576+
.modal-header {
2577+
padding: 15px 20px;
2578+
}
2579+
25672580
.modal-footer{
2568-
margin: 15px -12px -10px -12px;
2569-
padding: 10px 0px 5px 0px;
2581+
padding: 15px 20px;
2582+
}
2583+
2584+
.modal-footer .btn {
2585+
margin-right: -30px;
25702586
}
25712587

25722588
/** Grigio chiaro per voci plugin non disponibili **/
@@ -3220,4 +3236,11 @@ section.content, .main-footer {
32203236
margin-left: 5px;
32213237
background-color: rgba(255,255,255,0.3);
32223238
transition: all 0.2s ease;
3239+
}
3240+
3241+
#tablelistini_wrapper .dataTables_paginate .paginate_button {
3242+
margin: 0 3px;
3243+
padding: 8px 12px;
3244+
vertical-align: top;
3245+
line-height: 1.2;
32233246
}

‎assets/src/js/functions/hooks.js‎

Lines changed: 34 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,45 @@ function handleHooksSuccess(hooks) {
3535
}
3636

3737
hooks.forEach(function (item, index) {
38-
renderHook(item, {
39-
show: true,
40-
message: globals.translations.hookExecuting.replace('_NAME_', item.name)
41-
});
38+
renderHook(item);
4239

43-
startHook(item, true);
40+
//startHooks(item, true);
4441
completedRequests++;
4542
});
4643

44+
// Rimozione eventuale della rotella di caricamento
45+
var number = $("#hooks > div").length;
46+
47+
if (number == 0) {
48+
$("#hooks-notified").html('<i class="fa fa-check" aria-hidden="true"></i>');
49+
$("#hooks-badge").removeClass();
50+
$("#hooks-badge").addClass('badge').addClass('badge-success');
51+
} else {
52+
$("#hooks-notified").text(number);
53+
$("#hooks-badge").removeClass();
54+
$("#hooks-badge").addClass('badge').addClass('badge-danger');
55+
}
56+
57+
$("#hooks-loading").hide();
58+
59+
var hookMessage;
60+
if (number > 1) {
61+
hookMessage = globals.translations.hookMultiple.replace('_NUM_', number);
62+
} else if (number == 1) {
63+
hookMessage = globals.translations.hookSingle;
64+
} else {
65+
hookMessage = globals.translations.hookNone;
66+
}
67+
68+
$("#hooks-header").text(hookMessage);
69+
4770
totalRequests = hooks.length;
4871
if (completedRequests === totalRequests) {
4972
// Verifica se tutte le richieste sono state completate con successo
5073
//console.log("Tutte le richieste AJAX sono state eseguite con successo.");
5174
}else{
5275
console.log("Alcune richieste AJAX non sono state eseguite.");
5376
}
54-
5577
}
5678

5779
function startHooks() {
@@ -71,156 +93,20 @@ function startHooks() {
7193
});
7294
}
7395

74-
/**
75-
* Richiama l'hook per l'esecuzione.
76-
*
77-
* @param hook
78-
*/
79-
function startHook(hook, init) {
80-
if (document.hasFocus()) {
81-
$.ajax({
82-
url: globals.rootdir + "/ajax.php",
83-
type: "get",
84-
data: {
85-
op: "hook-lock",
86-
id: hook.id,
87-
},
88-
success: function (data) {
89-
var token = JSON.parse(data);
90-
91-
if (init) {
92-
hookCount("#hooks-counter");
93-
94-
updateHook(hook);
95-
}
96-
97-
if (token) {
98-
executeHook(hook, token);
99-
} else {
100-
//Rallentamento esecuzione hooks
101-
var timeout = 30;
102-
103-
setTimeout(function () {
104-
startHook(hook);
105-
}, timeout * 1000);
106-
}
107-
},
108-
});
109-
} else {
110-
var timeout = 30;
111-
112-
setTimeout(function () {
113-
startHook(hook);
114-
}, timeout * 1000);
115-
}
116-
}
117-
118-
/**
119-
* Richiama l'hook per l'esecuzione.
120-
*
121-
* @param hook
122-
* @param token
123-
*/
124-
function executeHook(hook, token) {
125-
$.ajax({
126-
url: globals.rootdir + "/ajax.php",
127-
type: "get",
128-
data: {
129-
op: "hook-execute",
130-
id: hook.id,
131-
token: token,
132-
},
133-
success: function (data) {
134-
var result = JSON.parse(data);
135-
updateHook(hook);
136-
137-
var timeout;
138-
if (result.execute) {
139-
startHook(hook);
140-
} else {
141-
timeout = 60;
142-
143-
setTimeout(function () {
144-
startHook(hook);
145-
}, timeout * 1000);
146-
}
147-
},
148-
});
149-
}
150-
151-
/**
152-
* Aggiorna le informazioni dell'hook.
153-
*
154-
* @param hook
155-
* @param init
156-
*/
157-
function updateHook(hook) {
158-
$.ajax({
159-
url: globals.rootdir + "/ajax.php",
160-
type: "get",
161-
data: {
162-
op: "hook-response",
163-
id: hook.id,
164-
},
165-
success: function (data) {
166-
var result = JSON.parse(data);
167-
renderHook(hook, result);
168-
169-
// Rimozione eventuale della rotella di caricamento
170-
var counter = $("#hooks-counter").text();
171-
var number = $("#hooks > div").length;
172-
173-
if (number == 0) {
174-
$("#hooks-notified").html('<i class="fa fa-check" aria-hidden="true"></i>');
175-
$("#hooks-badge").removeClass();
176-
$("#hooks-badge").addClass('badge').addClass('badge-success');
177-
} else {
178-
$("#hooks-notified").text(number);
179-
$("#hooks-badge").removeClass();
180-
$("#hooks-badge").addClass('badge').addClass('badge-danger');
181-
}
182-
183-
if (counter == $("#hooks-number").text()) {
184-
$("#hooks-loading").hide();
185-
186-
var hookMessage;
187-
if (number > 1) {
188-
hookMessage = globals.translations.hookMultiple.replace('_NUM_', number);
189-
} else if (number == 1) {
190-
hookMessage = globals.translations.hookSingle;
191-
} else {
192-
hookMessage = globals.translations.hookNone;
193-
}
194-
195-
$("#hooks-header").text(hookMessage);
196-
}
197-
},
198-
});
199-
}
200-
201-
/**
202-
* Aggiunta dell'hook al numero totale.
203-
*/
204-
function hookCount(id, value) {
205-
value = value ? value : 1;
96+
var timeout = 60;
20697

207-
var element = $(id);
208-
var number = parseInt(element.text());
209-
number = isNaN(number) ? 0 : number;
210-
211-
number += value;
212-
element.text(number);
213-
214-
return number;
215-
}
98+
setInterval(function () {
99+
startHooks();
100+
}, timeout * 1000);
216101

217102
/**
218103
* Genera l'HTML per la visualizzazione degli hook.
219104
*
220105
* @param element_id
221106
* @param result
222107
*/
223-
function renderHook(hook, result) {
108+
function renderHook(hook) {
109+
var result = hook.content;
224110
if (result.length == 0) return;
225111

226112
var element_id = "hook-" + hook.id;

0 commit comments

Comments
 (0)