loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-15 02:50:43 +01:00
Code Issues Releases Activity

Visualizzazione attività in Dashboard per permessi in sola lettura

Browse Source 
Correzioni minori, fix visualizzazione attività con tecnico assegnato per Anagrafiche di tipo Tecnico (#970).
This commit is contained in:
Dasc3er 2021-07-23 11:37:46 +02:00
parent 57e0b204f5
commit 47b19efe57
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dashboard/actions.php → modules/dashboard/ajax.php Executable file → Normal file
View File

@ -126,7 +126,7 @@ switch (filter('op')) {
( (
(co_preventivi.data_accettazione >= '.prepare($start).' AND co_preventivi.data_accettazione <= '.prepare($end).') (co_preventivi.data_accettazione >= '.prepare($start).' AND co_preventivi.data_accettazione <= '.prepare($end).')
OR (co_preventivi.data_conclusione >= '.prepare($start).' AND co_preventivi.data_conclusione <= '.prepare($end).') OR (co_preventivi.data_conclusione >= '.prepare($start).' AND co_preventivi.data_conclusione <= '.prepare($end).')
) )
AND AND
co_statipreventivi.is_pianificabile=1'; co_statipreventivi.is_pianificabile=1';

10
modules/dashboard/edit.php
View File

@ -335,7 +335,7 @@ $modulo_interventi = Modules::get('Interventi');
echo ' echo '
<script type="text/javascript"> <script type="text/javascript">
globals.dashboard = { globals.dashboard = {
load_url: globals.rootdir + "/actions.php?id_module='.$id_module.'", load_url: "'.$structure->fileurl('ajax.php').'?id_module='.$id_module.'",
style: "'.$def.'", style: "'.$def.'",
show_sunday: '.intval(setting('Visualizzare la domenica sul calendario')).', show_sunday: '.intval(setting('Visualizzare la domenica sul calendario')).',
start_time: "'.setting('Ora inizio sul calendario').'", start_time: "'.setting('Ora inizio sul calendario').'",
@ -559,7 +559,7 @@ echo '
select: function(start, end, allDay) { // info select: function(start, end, allDay) { // info
// let start = info.start; // let start = info.start;
// let end = info.end; // let end = info.end;
let is_allDay = !start.hasTime() && !end.hasTime(); let is_allDay = !start.hasTime() && !end.hasTime();
if (is_allDay!==true){ if (is_allDay!==true){
@ -580,7 +580,7 @@ echo '
editable: globals.dashboard.write_permission, editable: globals.dashboard.write_permission,
eventDrop: function(event, delta, revertFunc ) {// info eventDrop: function(event, delta, revertFunc ) {// info
// let event = info.event; // let event = info.event;
if (event.allDay!==true){ if (event.allDay!==true){
$.post(globals.dashboard.load_url, { $.post(globals.dashboard.load_url, {
op: "modifica_intervento", op: "modifica_intervento",
@ -599,7 +599,7 @@ echo '
if (data !=="ok"){ if (data !=="ok"){
revertFunc(); // info.revert(); revertFunc(); // info.revert();
} }
}); });
}else{ }else{
@ -617,7 +617,7 @@ echo '
timeEnd: moment(event.end).format("YYYY-MM-DD HH:mm") timeEnd: moment(event.end).format("YYYY-MM-DD HH:mm")
}, function (data, response) { }, function (data, response) {
data = $.trim(data); data = $.trim(data);
if (response == "success" && data !== "ok") { if (response == "success" && data !== "ok") {
swal("'.tr('Attenzione').'", data, "warning"); swal("'.tr('Attenzione').'", data, "warning");
}else if (response !== "success"){ }else if (response !== "success"){

2
src/API/Common/Task.php
View File

@ -86,7 +86,7 @@ class Task extends Resource implements RetrieveInterface, CreateInterface
$endpointParts = parse_url($endpoint); $endpointParts = parse_url($endpoint);
$endpointParts['path'] = $endpointParts['path'] ?: '/'; $endpointParts['path'] = $endpointParts['path'] ?: '/';
$endpointParts['port'] = $endpointParts['port'] ?: $endpointParts['scheme'] === 'https' ? 443 : 80; $endpointParts['port'] = $endpointParts['port'] ?: ($endpointParts['scheme'] === 'https' ? 443 : 80);
$contentLength = strlen($postData); $contentLength = strlen($postData);

1
src/API/Response.php
View File

@ -178,6 +178,7 @@ class Response
$messages = array_column(self::$status, 'message'); $messages = array_column(self::$status, 'message');
$array['message'] = $messages[array_search($array['status'], $codes)]; $array['message'] = $messages[array_search($array['status'], $codes)];
http_response_code($array['status']);
} }
$flags = JSON_FORCE_OBJECT; $flags = JSON_FORCE_OBJECT;

2
update/2_4_24.sql
View File

@ -138,3 +138,5 @@ INSERT INTO `zz_api_resources` (`id`, `version`, `type`, `resource`, `class`, `e
-- Aggiunto collegamento tra DDT in direzioni opposte per gestione movimentazioni interne tra sedi -- Aggiunto collegamento tra DDT in direzioni opposte per gestione movimentazioni interne tra sedi
ALTER TABLE `dt_ddt` ADD `id_ddt_trasporto_interno` INT(11) NULL, ADD FOREIGN KEY (`id_ddt_trasporto_interno`) REFERENCES `dt_ddt`(`id`) ON DELETE CASCADE; ALTER TABLE `dt_ddt` ADD `id_ddt_trasporto_interno` INT(11) NULL, ADD FOREIGN KEY (`id_ddt_trasporto_interno`) REFERENCES `dt_ddt`(`id`) ON DELETE CASCADE;
UPDATE `zz_group_module` SET `clause` = 'in_interventi.id IN (SELECT idintervento FROM in_interventi_tecnici WHERE idintervento=in_interventi.id AND idtecnico=|id_anagrafica| UNION SELECT id_intervento FROM in_interventi_tecnici_assegnati WHERE id_intervento=in_interventi.id AND id_tecnico=|id_anagrafica|)' WHERE `zz_group_module`.`name` = 'Mostra interventi ai tecnici coinvolti';