Skip to content

Commit a40b1ae

Browse files
tsmrtsmr
committed
Min fixes
Bump version
1 parent f8d2b2d commit a40b1ae

13 files changed

Lines changed: 275 additions & 321 deletions

‎hook.php‎

Lines changed: 90 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function plugin_timelineticket_getAddSearchOptions($itemtype)
151151
if ($itemtype == 'Ticket') {
152152
$sopt[9131]['table'] = 'glpi_groups';
153153
$sopt[9131]['field'] = 'completename';
154-
$sopt[9131]['name'] = "timelineticket - ".__('Assigned to')." - ".__('Group');
154+
$sopt[9131]['name'] = _n("Timeline of ticket", "Timeline of tickets", 2, "timelineticket")." - ".__('Assigned to')." - ".__('Group');
155155
$sopt[9131]['datatype'] = 'dropdown';
156156
$sopt[9131]['forcegroupby'] = true;
157157
$sopt[9131]['massiveaction'] = false;
@@ -163,7 +163,7 @@ function plugin_timelineticket_getAddSearchOptions($itemtype)
163163

164164
$sopt[9132]['table'] = 'glpi_users';
165165
$sopt[9132]['field'] = 'name';
166-
$sopt[9132]['name'] = "timelineticket - ".__('Assigned to')." - ".__('Technician');
166+
$sopt[9132]['name'] = _n("Timeline of ticket", "Timeline of tickets", 2, "timelineticket")." - ".__('Assigned to')." - ".__('Technician');
167167
$sopt[9132]['datatype'] = 'dropdown';
168168
$sopt[9132]['forcegroupby'] = true;
169169
$sopt[9132]['massiveaction'] = false;
@@ -178,112 +178,110 @@ function plugin_timelineticket_getAddSearchOptions($itemtype)
178178

179179
function plugin_timelineticket_giveItem($type, $ID, $data, $num)
180180
{
181-
$searchopt= Search::getOptions($type);
182-
$table=$searchopt[$ID]["table"];
183-
$field=$searchopt[$ID]["field"];
181+
$searchopt = Search::getOptions($type);
182+
$table = $searchopt[$ID]["table"];
183+
$field = $searchopt[$ID]["field"];
184184

185185
switch ($table.'.'.$field) {
186186
case "glpi_plugin_timelineticket_grouplevels.groups":
187-
if (empty($data["ITEM_$num"])) {
187+
if (empty($data['raw']["ITEM_".$num])) {
188188
$out=__('None');
189189
} else {
190190
$out= "";
191-
$groups = json_decode($data["ITEM_$num"], true);
191+
$groups = json_decode($data['raw']["ITEM_".$num], true);
192192
if (!empty($groups)) {
193193
foreach ($groups as $key => $val) {
194194
$out .= Dropdown::getDropdownName("glpi_groups", $val)."<br>";
195195
}
196196
}
197197
}
198198
return $out;
199-
break;
200-
201-
case "glpi_plugin_timelineticket_assigngroups.groups_id":
202-
$ptAssignGroup = new AssignGroup();
203-
$group = new Group();
204-
$ticket = new Ticket();
205-
$out = "";
206-
$a_out = [];
207-
$a_groupname = [];
208-
if (!isset($data["ITEM_$num"])
209-
or !strstr($data["ITEM_$num"], '$$')) {
210-
return "";
211-
}
212-
$splitg = explode("$$$$", $data["ITEM_$num"]);
213-
foreach ($splitg as $datag) {
214-
$split = explode("$$", $datag);
215-
$group->getFromDB($split[0]);
216-
$ptAssignGroup->getFromDB($split[1]);
217-
$time = $ptAssignGroup->fields['delay'];
218-
if ($ptAssignGroup->fields['delay'] === null) {
219-
$ticket->getFromDB($data["ITEM_0"]);
220-
221-
$calendar = new Calendar();
222-
$calendars_id = Entity::getUsedConfig(
223-
'calendars_strategy',
224-
$ticket->fields['entities_id'],
225-
'calendars_id',
226-
0
227-
);
228-
$datedebut = $ptAssignGroup->fields['date'];
229-
$enddate = $_SESSION["glpi_currenttime"];
230-
if ($ticket->fields['status'] == Ticket::CLOSED) {
231-
$enddate = $ticket->fields['closedate'];
232-
}
233-
234-
if ($calendars_id>0 && $calendar->getFromDB($calendars_id)) {
235-
$time = $calendar->getActiveTimeBetween($datedebut, $enddate);
236-
} else {
237-
// cas 24/24 - 7/7
238-
$time = strtotime($enddate)-strtotime($datedebut);
239-
}
240-
} elseif ($ptAssignGroup->fields['delay'] == 0) {
241-
$time = 0;
242-
}
243-
$a_groupname[$group->fields['id']] = $group->getLink();
244-
if (isset($a_out[$group->fields['id']])) {
245-
$a_out[$group->fields['id']] += $time;
246-
} else {
247-
$a_out[$group->fields['id']] = $time;
248-
}
249-
}
250-
$a_out_comp = [];
251-
foreach ($a_out as $groups_id => $time) {
252-
$a_out_comp[] = $a_groupname[$groups_id]." : ".Html::timestampToString($time, true, false);
253-
}
254199

255-
$out = implode("<hr/>", $a_out_comp);
256-
return $out;
257-
break;
200+
// case "glpi_plugin_timelineticket_assigngroups.groups_id":
201+
// $ptAssignGroup = new AssignGroup();
202+
// $group = new Group();
203+
// $ticket = new Ticket();
204+
// $out = "";
205+
// $a_out = [];
206+
// $a_groupname = [];
207+
// if (!isset($data["ITEM_$num"])
208+
// or !strstr($data["ITEM_$num"], '$$')) {
209+
// return "";
210+
// }
211+
// $splitg = explode("$$$$", $data["ITEM_$num"]);
212+
// foreach ($splitg as $datag) {
213+
// $split = explode("$$", $datag);
214+
// $group->getFromDB($split[0]);
215+
// $ptAssignGroup->getFromDB($split[1]);
216+
// $time = $ptAssignGroup->fields['delay'];
217+
// if ($ptAssignGroup->fields['delay'] === null) {
218+
// $ticket->getFromDB($data["ITEM_0"]);
219+
//
220+
// $calendar = new Calendar();
221+
// $calendars_id = Entity::getUsedConfig(
222+
// 'calendars_strategy',
223+
// $ticket->fields['entities_id'],
224+
// 'calendars_id',
225+
// 0
226+
// );
227+
// $datedebut = $ptAssignGroup->fields['date'];
228+
// $enddate = $_SESSION["glpi_currenttime"];
229+
// if ($ticket->fields['status'] == Ticket::CLOSED) {
230+
// $enddate = $ticket->fields['closedate'];
231+
// }
232+
//
233+
// if ($calendars_id >0 && $calendar->getFromDB($calendars_id)) {
234+
// $time = $calendar->getActiveTimeBetween($datedebut, $enddate);
235+
// } else {
236+
// // cas 24/24 - 7/7
237+
// $time = strtotime($enddate)-strtotime($datedebut);
238+
// }
239+
// } elseif ($ptAssignGroup->fields['delay'] == 0) {
240+
// $time = 0;
241+
// }
242+
// $a_groupname[$group->fields['id']] = $group->getLink();
243+
// if (isset($a_out[$group->fields['id']])) {
244+
// $a_out[$group->fields['id']] += $time;
245+
// } else {
246+
// $a_out[$group->fields['id']] = $time;
247+
// }
248+
// }
249+
// $a_out_comp = [];
250+
// foreach ($a_out as $groups_id => $time) {
251+
// $a_out_comp[] = $a_groupname[$groups_id]." : ".Html::timestampToString($time, true, false);
252+
// }
253+
//
254+
// $out = implode("<hr/>", $a_out_comp);
255+
// return $out;
258256
}
259257
return "";
260258
}
261259

262260

263-
function plugin_timelineticket_addLeftJoin(
264-
$itemtype,
265-
$ref_table,
266-
$new_table,
267-
$linkfield,
268-
&$already_link_tables
269-
)
270-
{
271-
switch ($itemtype) {
272-
case 'Ticket':
273-
if ($new_table.".".$linkfield ==
274-
"glpi_plugin_timelineticket_assigngroups.plugin_timelineticket_assigngroups_id") {
275-
276-
$out['LEFT JOIN'] = [
277-
'glpi_plugin_timelineticket_assigngroups' => [
278-
'ON' => [
279-
'glpi_tickets' => 'id',
280-
'glpi_plugin_timelineticket_assigngroups' => 'tickets_id',
281-
],
282-
],
283-
];
284-
return $out;
285-
}
286-
break;
287-
}
288-
return "";
289-
}
261+
//function plugin_timelineticket_addLeftJoin(
262+
// $itemtype,
263+
// $ref_table,
264+
// $new_table,
265+
// $linkfield,
266+
// &$already_link_tables
267+
//)
268+
//{
269+
// switch ($itemtype) {
270+
// case 'Ticket':
271+
// if ($new_table.".".$linkfield ==
272+
// "glpi_plugin_timelineticket_assigngroups.plugin_timelineticket_assigngroups_id") {
273+
//
274+
// $out['LEFT JOIN'] = [
275+
// 'glpi_plugin_timelineticket_assigngroups' => [
276+
// 'ON' => [
277+
// 'glpi_tickets' => 'id',
278+
// 'glpi_plugin_timelineticket_assigngroups' => 'tickets_id',
279+
// ],
280+
// ],
281+
// ];
282+
// return $out;
283+
// }
284+
// break;
285+
// }
286+
// return "";
287+
//}

‎install/index.php‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎install/mysql/plugin_timelineticket-empty.sql‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎locales/fr_FR.mo‎

223 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)