Skip to content

Commit 3d0a336

Browse files
salleman33salleman33
committed
nettoyage + lint + cs
1 parent ffb37f0 commit 3d0a336

File tree

5 files changed

+20
-122
lines changed

5 files changed

+20
-122
lines changed

‎front/query.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
if (isset($_GET['mailuser'])) {
2020
if (PluginReservationReservation::sendMail($_GET['mailuser'])) {
2121
return http_response_code(200);
22-
} else {
22+
} else {
2323
return http_response_code(500);
2424
}
2525
}
2626
if (isset($_GET['checkout'])) {
2727
if (PluginReservationReservation::checkoutReservation($_GET['checkout'])) {
2828
return http_response_code(200);
29-
} else {
29+
} else {
3030
return http_response_code(500);
3131
}
3232
}
3333
if (isset($_GET['checkin'])) {
3434
if (PluginReservationReservation::checkinReservation($_GET['checkin'])) {
3535
return http_response_code(200);
36-
} else {
36+
} else {
3737
return http_response_code(500);
3838
}
3939
}

‎inc/category.class.php‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private function deleteCategory($name)
7777

7878
$items = new PluginReservationCategory_Item();
7979
$items_table = $items->getTable();
80-
80+
8181
$DB->deleteOrDie(
8282
$items_table,
8383
[
@@ -93,31 +93,6 @@ private function deleteCategory($name)
9393
);
9494
}
9595

96-
/**
97-
* Get current categories sorted and items config
98-
* @return array array of items by categories like ["cat1" => [1,2,3,4], "cat2" => [5,6] ]
99-
*/
100-
public static function getCategoriesConfig()
101-
{
102-
$result = [];
103-
$list_reservationitems = self::getReservationItems();
104-
foreach ($list_reservationitems as $item) {
105-
$category_name = $item['category_name'];
106-
if ($category_name === null) {
107-
$category_name = 'zzpluginnotcategorized';
108-
}
109-
110-
if (array_key_exists($category_name, $result)) {
111-
array_push($result[$category_name], $item["items_id"]);
112-
} else {
113-
$result[$category_name] = [];
114-
array_push($result[$category_name], $item["items_id"]);
115-
}
116-
}
117-
ksort($result);
118-
return $result;
119-
}
120-
12196
/**
12297
* get reservation items merged with their category configs (id, name, priority)
12398
* @return array list of reservation items like [{"id":"1","comment":"Windows 10","name":"computer 1","entities_id":"0","category_name":"Windows","category_id":"11","items_priority":"1","items_id":"1","itemtype":"Computer"}{...}{...}],
@@ -129,7 +104,6 @@ public static function getReservationItems($begin = '', $end = '', $available =
129104
if (isset($optional["filter_is_active"])) {
130105
$filter_is_active = $optional["filter_is_active"];
131106
}
132-
133107
$result = [];
134108

135109
foreach ($CFG_GLPI["reservation_types"] as $itemtype) {
@@ -140,10 +114,18 @@ public static function getReservationItems($begin = '', $end = '', $available =
140114
$categories_table = getTableForItemType(__CLASS__);
141115
$category_items_table = getTableForItemType("PluginReservationCategory_Item");
142116

143-
$left = "LEFT JOIN `glpi_reservations`
144-
ON (`glpi_reservationitems`.`id` = `glpi_reservations`.`reservationitems_id`
145-
AND '" . $begin . "' < `glpi_reservations`.`end`
146-
AND '" . $end . "' > `glpi_reservations`.`begin`)";
117+
$left = '';
118+
if ($begin != '' && $end != '') {
119+
$left .= "LEFT JOIN `glpi_reservations`
120+
ON (`glpi_reservationitems`.`id` = `glpi_reservations`.`reservationitems_id`";
121+
if ($begin != '') {
122+
$left .= "AND '" . $begin . "' < `glpi_reservations`.`end`";
123+
}
124+
if ($end != '') {
125+
$left .= "AND '" . $end . "' > `glpi_reservations`.`begin`";
126+
}
127+
$left .= ")";
128+
}
147129

148130
$where = $available ? " AND `glpi_reservations`.`id` IS NULL " : '';
149131

@@ -166,9 +148,8 @@ public static function getReservationItems($begin = '', $end = '', $available =
166148
LEFT OUTER JOIN `$categories_table`
167149
ON `$category_items_table`.`categories_id` = `$categories_table`.`id`
168150
$left
169-
WHERE `glpi_reservationitems`.`is_active` = '1'
151+
WHERE `$itemtable`.`is_deleted` = '0'
170152
" . ($filter_is_active ? "AND `glpi_reservationitems`.`is_active` = '1'" : "") . "
171-
AND `$itemtable`.`is_deleted` = '0'
172153
$where " .
173154
getEntitiesRestrictRequest(
174155
" AND",

‎inc/config.class.php‎

Lines changed: 1 addition & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function ($element) use ($category) {
8686
}
8787
echo '<select id="select_availableItems" size="' . count($availableItems_array) + count($selectedItems_array) . '">';
8888
foreach ($availableItems_array as $item) {
89-
echo '<option value="' .$item['id']. '">' . $item['name'] . '</option>';
89+
echo '<option value="' . $item['id'] . '">' . $item['name'] . '</option>';
9090
}
9191
echo '</select>';
9292
echo '</div>';
@@ -377,20 +377,11 @@ private function showConfigCategoriesForm()
377377
$menu .= '<td>';
378378
$menu .= '<input class="noEnterSubmit" onkeydown="createCategoryEnter()" type="text" id="newCategoryTitle" size="15" title="Please enter a type">';
379379
$menu .= '<button type="button" onclick="createCategory()">' . _sx('button', 'Add') . '</button>';
380-
// $menu .= '<div style="clear: left;" id="categoriesContainer">';
381380
$menu .= '<table class="listCustomCategories" id="categoriesContainer">';
382381
$menu .= '<tbody>';
383382

384383
$categories_names = PluginReservationCategory::getCategoriesNames();
385-
// $all_reservation_items = PluginReservationCategory::getReservationItems('', '', false, ["filter_is_active" => false]);
386384
foreach ($categories_names as $category_name) {
387-
// $filtered_array = array_filter(
388-
// $all_reservation_items,
389-
// function ($element) use ($category_name) {
390-
// return ($element['category_name'] == $category_name);
391-
// }
392-
// );
393-
394385
$it = 0;
395386
if ($category_name === "zzpluginnotcategorized") {
396387
continue;
@@ -401,87 +392,13 @@ private function showConfigCategoriesForm()
401392
$menu .= '<td><button type="button" onclick="deleteCategory(\'' . $category_name . '\')" class="categoryClose" >X</td>';
402393
$menu .= '<input type="hidden" name="category_' . $category_name . '" value="' . $category_name . '">';
403394
$menu .= '</tr>';
404-
// $menu .= $this->openCategoryHtml($category_name, $category_name);
405-
// foreach ($filtered_array as $reservation_item) {
406-
// $it++;
407-
// $menu .= $this->makeItemHtml($reservation_item, $category_name, $it);
408-
// }
409-
// $menu .= $this->closeCategoryHtml();
410395
}
411396
$menu .= '</tbody>';
412397
$menu .= '</table>';
413398
$menu .= '</td>';
414-
// $menu .= '<td>';
415-
416-
// $menu .= $this->openCategoryHtml('zzpluginnotcategorized', '', false);
417-
// // if (in_array('zzpluginnotcategorized', $categories_names)) {
418-
// $filtered_array = array_filter(
419-
// $all_reservation_items,
420-
// function ($element) {
421-
// return ($element['category_name'] === 'zzpluginnotcategorized' || is_null($element['category_name']));
422-
// }
423-
// );
424-
// $it = 0;
425-
// foreach ($filtered_array as $reservation_item) {
426-
// $it++;
427-
// $menu .= $this->makeItemHtml($reservation_item, 'zzpluginnotcategorized', $it);
428-
// }
429-
// // }
430-
// $menu .= $this->closeCategoryHtml();
431-
432-
// $menu .= '<div style="clear: left;"></div>';
433-
// $menu .= '</td>';
434399
$menu .= "</tr>";
435400
$menu .= "</table>";
436401

437402
return $menu;
438403
}
439-
440-
/**
441-
* make html code for an item
442-
* @param hash $reservation_item item
443-
* @param string $category_name name of the category item
444-
* @param integer $index index of the item
445-
* @return string code html
446-
*/
447-
private function makeItemHtml($reservation_item, $category_name, $index)
448-
{
449-
$html = '<tr class="draggable" ' . ($reservation_item['is_active'] == '1' ? '' : 'style="background-color:#f36647 "') . ' id="item_' . $reservation_item['id'] . '">';
450-
$html .= '<input type="hidden" name="item_' . $reservation_item['id'] . '" value="' . $category_name . '">';
451-
$html .= '<td>' . $reservation_item['name'] . '</td>';
452-
$html .= '<td>' . nl2br($reservation_item['comment']) . '</td>';
453-
$html .= '<td class="index">' . $index . '</td>';
454-
$html .= '</tr>';
455-
return $html;
456-
}
457-
458-
/**
459-
* make html code to open category
460-
* @param string $category_name name of this category
461-
* @param string $category_name title displayed
462-
* @param boolean $deletable category is deletable or not
463-
* @return string code html
464-
*/
465-
private function openCategoryHtml($category_name, $category_title, $deletable = true)
466-
{
467-
$html = '<table class="dropper" id="itemsCategory_' . $category_name . '">';
468-
$html .= '<thead>';
469-
$html .= '<th colspan="3" class="categoryTitle">' . $category_title . '</th>';
470-
$deletable && $html .= '<td onclick="deleteCategory(\'' . $category_name . '\')" class="categoryClose" >X</td>';
471-
$html .= '</thead>';
472-
$html .= '<input type="hidden" name="category_' . $category_name . '" value="' . $category_name . '">';
473-
$html .= '<tbody>';
474-
return $html;
475-
}
476-
477-
/**
478-
* make html code to close category
479-
* @return string code html
480-
*/
481-
private function closeCategoryHtml()
482-
{
483-
$html = '</tbody>';
484-
$html .= "</table>";
485-
return $html;
486-
}
487404
}

‎inc/menu.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ private static function displayTabReservations($begin, $end, $listResaByUser, $i
531531

532532
// case if multi edit enabled for first item
533533
echo "<td class='showIfMultiEditEnabled' rowspan='" . $rowspan_line . "'>";
534-
echo "<a class='bouton' title='" . __('Edit multiple', 'reservation') . "' onclick=\"makeAChange('" .'multiedit.form.php' . $str_multiEditParams . "');\" href=\"javascript:void(0);\">" . __('Edit multiple', 'reservation') . "</a>";
534+
echo "<a class='bouton' title='" . __('Edit multiple', 'reservation') . "' onclick=\"makeAChange('" . 'multiedit.form.php' . $str_multiEditParams . "');\" href=\"javascript:void(0);\">" . __('Edit multiple', 'reservation') . "</a>";
535535
echo "</td>";
536536

537537
// case if multi edit disable for first item

‎js/tools.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function removeItemFromCategory() {
8080
function upItemInCategory() {
8181
var opt = $('#select_selectedItems option:selected');
8282

83-
if(opt.is(':last-child')) {
83+
if(opt.is(':first-child')) {
8484
opt.insertAfter($('#select_selectedItems option:last-child'));
8585
}
8686
else {

0 commit comments

Comments
 (0)