|
@@ -71,8 +71,12 @@ $search_code = GETPOST('search_code', 'alpha');
|
|
|
$search_ref = GETPOST('search_ref', 'alpha');
|
|
|
$search_amount = GETPOST('search_amount', 'alpha');
|
|
|
|
|
|
-if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_startmonth')) {
|
|
|
+if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_startmonth') && !GETPOSTISSET('begin')) {
|
|
|
$search_start = dol_time_plus_duree(dol_now(), '-1', 'w');
|
|
|
+ $tmparray = dol_getdate($search_start);
|
|
|
+ $search_startday = $tmparray['mday'];
|
|
|
+ $search_startmonth = $tmparray['mon'];
|
|
|
+ $search_startyear = $tmparray['year'];
|
|
|
}
|
|
|
|
|
|
// Load variable for pagination
|
|
@@ -122,6 +126,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
|
|
|
$search_ref = '';
|
|
|
$search_amount = '';
|
|
|
$search_showonlyerrors = 0;
|
|
|
+ $search_startyear = '';
|
|
|
+ $search_startmonth = '';
|
|
|
+ $search_startday = '';
|
|
|
+ $search_endyear = '';
|
|
|
+ $search_endmonth = '';
|
|
|
+ $search_endday = '';
|
|
|
$toselect = array();
|
|
|
$search_array_options = array();
|
|
|
}
|
|
@@ -393,8 +403,6 @@ print '</form>';
|
|
|
|
|
|
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
|
|
|
|
|
|
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
|
|
-
|
|
|
if ($optioncss != '') {
|
|
|
print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
|
|
}
|
|
@@ -407,11 +415,20 @@ print '<input type="hidden" name="page" value="'.$page.'">';
|
|
|
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
|
|
|
print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
|
|
|
|
|
|
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
|
|
print '<table class="noborder centpercent">';
|
|
|
|
|
|
// Line of filters
|
|
|
print '<tr class="liste_titre_filter">';
|
|
|
|
|
|
+// Action column
|
|
|
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="liste_titre center">';
|
|
|
+ $searchpicto = $form->showFilterButtons();
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
+
|
|
|
print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.dol_escape_htmltag($search_id).'"></td>';
|
|
|
|
|
|
print '<td class="liste_titre">';
|
|
@@ -429,7 +446,6 @@ print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, '',
|
|
|
print '</td>';
|
|
|
|
|
|
// Actions code
|
|
|
-$langs->load("blockedlog");
|
|
|
print '<td class="liste_titre">';
|
|
|
print $form->selectarray('search_code', $block_static->trackedevents, $search_code, 1, 0, 0, '', 1, 0, 0, 'ASC', 'maxwidth200', 1);
|
|
|
print '</td>';
|
|
@@ -459,26 +475,35 @@ print '</td>';
|
|
|
print '<td class="liste_titre"></td>';
|
|
|
|
|
|
// Action column
|
|
|
-print '<td class="liste_titre" align="middle">';
|
|
|
-$searchpicto = $form->showFilterButtons();
|
|
|
-print $searchpicto;
|
|
|
-print '</td>';
|
|
|
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="liste_titre center">';
|
|
|
+ $searchpicto = $form->showFilterButtons();
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
|
|
|
print '</tr>';
|
|
|
|
|
|
print '<tr class="liste_titre">';
|
|
|
+// Action column
|
|
|
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print getTitleFieldOfList('<span id="blockchainstatus"></span>', 0, $_SERVER["PHP_SELF"], '', '', $param, 'class="center"', $sortfield, $sortorder, '')."\n";
|
|
|
+}
|
|
|
print getTitleFieldOfList($langs->trans('#'), 0, $_SERVER["PHP_SELF"], 'rowid', '', $param, '', $sortfield, $sortorder, 'minwidth50 ')."\n";
|
|
|
print getTitleFieldOfList($langs->trans('Date'), 0, $_SERVER["PHP_SELF"], 'date_creation', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
print getTitleFieldOfList($langs->trans('Author'), 0, $_SERVER["PHP_SELF"], 'user_fullname', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
print getTitleFieldOfList($langs->trans('Action'), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
print getTitleFieldOfList($langs->trans('Ref'), 0, $_SERVER["PHP_SELF"], 'ref_object', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
-print getTitleFieldOfList($langs->trans('Amount'), 0, $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder, '')."\n";
|
|
|
-print getTitleFieldOfList($langs->trans('DataOfArchivedEvent'), 0, $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder, '')."\n";
|
|
|
+print getTitleFieldOfList($langs->trans('Amount'), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ')."\n";
|
|
|
+print getTitleFieldOfList($langs->trans('DataOfArchivedEvent'), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
|
|
|
print getTitleFieldOfList($langs->trans('Fingerprint'), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '')."\n";
|
|
|
-print getTitleFieldOfList($langs->trans('Status'), 0, $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder, '')."\n";
|
|
|
-print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder, '')."\n";
|
|
|
-print getTitleFieldOfList('<span id="blockchainstatus"></span>', 0, $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder, '')."\n";
|
|
|
+print getTitleFieldOfList($langs->trans('Status'), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
|
|
|
+print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
|
|
|
+// Action column
|
|
|
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print getTitleFieldOfList('<span id="blockchainstatus"></span>', 0, $_SERVER["PHP_SELF"], '', '', $param, 'class="center"', $sortfield, $sortorder, '')."\n";
|
|
|
+}
|
|
|
print '</tr>';
|
|
|
|
|
|
if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
|
|
@@ -529,6 +554,12 @@ if (is_array($blocks)) {
|
|
|
|
|
|
print '<tr class="oddeven">';
|
|
|
|
|
|
+ // Action column
|
|
|
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="liste_titre">';
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
+
|
|
|
// ID
|
|
|
print '<td>'.dol_escape_htmltag($block->id).'</td>';
|
|
|
|
|
@@ -559,7 +590,7 @@ if (is_array($blocks)) {
|
|
|
print '<td class="right nowraponall">'.price($block->amounts).'</td>';
|
|
|
|
|
|
// Details link
|
|
|
- print '<td align="center"><a href="#" data-blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
|
|
|
+ print '<td class="center"><a href="#" data-blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
|
|
|
|
|
|
// Fingerprint
|
|
|
print '<td class="nowrap">';
|
|
@@ -596,7 +627,11 @@ if (is_array($blocks)) {
|
|
|
}
|
|
|
print '</td>';
|
|
|
|
|
|
- print '<td></td>';
|
|
|
+ // Action column
|
|
|
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
|
|
+ print '<td class="liste_titre">';
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
|
|
|
print '</tr>';
|
|
|
}
|