From 68a7e85448c3c5ac2812d578417963a8555b83e1 Mon Sep 17 00:00:00 2001 From: geoffhumphrey Date: Tue, 15 Oct 2024 17:52:53 -0600 Subject: [PATCH] Address Issue #1577 --- eval/dashboard.eval.php | 42 ++++---- lib/process.lib.php | 2 +- output/pullsheets.output.php | 181 +++++++++++++++++++---------------- 3 files changed, 120 insertions(+), 105 deletions(-) diff --git a/eval/dashboard.eval.php b/eval/dashboard.eval.php index 924d0344..91d01065 100644 --- a/eval/dashboard.eval.php +++ b/eval/dashboard.eval.php @@ -322,9 +322,10 @@ function count_future($arr,$needle,$diff) { $table_assignment_pre .= ""; $table_assignment_pre .= ""; $table_assignment_pre .= ""; - $table_assignment_pre .= ""; + $table_assignment_pre .= ""; $table_assignment_pre .= ""; - $table_assignment_pre .= ""; + $table_assignment_pre .= ""; + $table_assignment_pre .= ""; $table_assignment_pre .= ""; $table_assignment_pre .= ""; $table_assignment_pre .= ""; @@ -337,10 +338,12 @@ function count_future($arr,$needle,$diff) { \"bStateSave\" : false, \"bLengthChange\" : false, \"aaSorting\": [[1,'asc'],[0,'asc']], + \"bProcessing\" : false, \"aoColumns\": [ null, null, null, + null, null ] }); @@ -368,9 +371,8 @@ function count_future($arr,$needle,$diff) { $score_style_data = explode("^",$score_style_data); - $query_entries = sprintf("SELECT id, brewBrewerID, brewStyle, brewCategorySort, brewCategory, brewSubCategory, brewInfo, brewJudgingNumber, brewName, brewPossAllergens, brewABV, brewJuiceSource, brewSweetnessLevel, brewMead1, brewMead2, brewMead3 FROM %s WHERE (brewCategorySort='%s' AND brewSubCategory='%s') AND brewReceived='1'", $prefix."brewing", $score_style_data[0], $score_style_data[1]); - if ($_SESSION['prefsDisplaySpecial'] == "J") $query_entries .= " ORDER BY brewJudgingNumber ASC;"; - else $query_entries .= " ORDER BY id ASC;"; + $query_entries = sprintf("SELECT * FROM %s WHERE (brewCategorySort='%s' AND brewSubCategory='%s') AND brewReceived='1'", $prefix."brewing", $score_style_data[0], $score_style_data[1]); + //$query_entries .= " ORDER BY brewJudgingNumber, brewCategorySort, brewSubCategory ASC;"; $entries = mysqli_query($connection,$query_entries) or die (mysqli_error($connection)); $row_entries = mysqli_fetch_assoc($entries); $totalRows_entries = mysqli_num_rows($entries); @@ -440,8 +442,8 @@ function count_future($arr,$needle,$diff) { } - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); - $style_display = $style.": ".$score_style_data[2]; + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); + $style_display = $style." ".$row_entries['brewStyle']; $info_display = ""; $allergen_display = ""; @@ -487,7 +489,7 @@ function count_future($arr,$needle,$diff) { if (!empty($row_entries['brewABV'])) { $additional_info++; - $abv_display .= "".$label_abv.": ".$row_entries['brewABV']; + $abv_display .= "".$label_abv.": ".number_format($row_entries['brewABV'],1); } if (($admin) && ($_SESSION['prefsStyleSet'] == "NWCiderCup") && (!empty($row_entries['brewJuiceSource']))) { @@ -530,21 +532,23 @@ function count_future($arr,$needle,$diff) { $table_assignment_data .= ""; $table_assignment_data .= ""; + $table_assignment_data .= ""; + $table_assignment_data .= ""; $table_assignment_data .= ""; $table_assignment_data .= ""; diff --git a/lib/process.lib.php b/lib/process.lib.php index e28a48c8..772f66f8 100644 --- a/lib/process.lib.php +++ b/lib/process.lib.php @@ -184,7 +184,7 @@ function generate_judging_numbers($brewing_db_table,$method) { $result = $db_conn->update ($brewing_db_table, $data); if (!$result) $status += 1; - $query_judging_numbers = sprintf("SELECT id,brewCategory,brewName FROM %s", $brewing_db_table); + $query_judging_numbers = sprintf("SELECT id,brewCategory,brewCategorySort,brewSubCategory,brewName FROM %s ORDER BY brewCategorySort,brewSubCategory ASC", $brewing_db_table); $judging_numbers = mysqli_query($connection,$query_judging_numbers) or die (mysqli_error($connection)); $row_judging_numbers = mysqli_fetch_assoc($judging_numbers); diff --git a/output/pullsheets.output.php b/output/pullsheets.output.php index ed5b4ab1..00a71edc 100644 --- a/output/pullsheets.output.php +++ b/output/pullsheets.output.php @@ -128,7 +128,7 @@ if ($row_entries) { - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; do { @@ -220,6 +220,11 @@ $table_info_header .= ""; } $table_info_header .= ""; + + $table_info_header .= "

"; + $table_info_header .= table_location($row_assignments['assignTable'],$_SESSION['prefsDateFormat'],$_SESSION['prefsTimeZone'],$_SESSION['prefsTimeFormat'],"default"); + if ($round != "default") $table_info_header .= sprintf("
%s %s",$label_round,$round); + $table_info_header .= "

"; if (!empty($table_flight_tbody)) { @@ -241,14 +246,14 @@ $table_flight_datatables .= "\"aaSorting\": [[1,'asc'],[0,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - //if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + //if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -329,7 +334,7 @@ foreach (array_unique($a) as $value) { include (DB.'output_pullsheets_entries.db.php'); - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; do { @@ -415,14 +420,14 @@ $table_flight_datatables .= "\"aaSorting\": [[1,'asc'],[0,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - //if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + //if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -494,13 +499,13 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -515,7 +520,7 @@ do { - $style = style_number_const($row_entries_mini['brewCategorySort'],$row_entries_mini['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries_mini['brewCategorySort'],$row_entries_mini['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries_mini['brewCategorySort']."^".$row_entries_mini['brewSubCategory']."^".$_SESSION['prefsStyleSet']; $special = style_convert($style_special,"9",$base_url); $special = explode("^",$special); @@ -674,14 +679,14 @@ $table_flight_datatables .= "\"aaSorting\": [[3,'asc'],[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -887,14 +892,14 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -919,7 +924,7 @@ $style_special = ""; if ($row_entries) { - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; } @@ -932,10 +937,12 @@ $table_flight_tbody .= ""; + $table_flight_tbody .= ""; + $table_flight_tbody .= ""; + $table_flight_tbody .= ""; + $table_flight_tbody .= ""; + $table_flight_tbody .= ""; + $table_flight_tbody .= "
".$label_number."".$label_number."".$label_style."".$label_notes."".$label_info."".$label_notes."".$label_actions."
".$number.""; $table_assignment_data .= $style_display; + $table_assignment_data .= ""; if ($additional_info > 0) { - $table_assignment_data .= "
    "; - if (!empty($info_display)) $table_assignment_data .= "
  • ".str_replace("^",", ",$info_display)."
    • "; - if (!empty($carb_display)) $table_assignment_data .= "
  • ".$carb_display."
    • "; - if (!empty($sweetness_display)) $table_assignment_data .= "
  • ".$sweetness_display."
    • "; - if (!empty($sweetness_level_display)) $table_assignment_data .= "
  • ".$sweetness_level_display."
    • "; - if (!empty($allergen_display)) $table_assignment_data .= "
  • ".$allergen_display."
    • "; - if (!empty($abv_display)) $table_assignment_data .= "
  • ".$abv_display."
    • "; - if (!empty($juice_src_display)) $table_assignment_data .= "
  • ".$juice_src_display."
    • "; - if (!empty($strength_display)) $table_assignment_data .= "
  • ".$strength_display."
    • "; - $table_assignment_data .= "
"; + $table_assignment_data .= "
    "; + if (!empty($info_display)) $table_assignment_data .= "
  • ".str_replace("^",", ",$info_display)."
    • "; + if (!empty($carb_display)) $table_assignment_data .= "
  • ".$carb_display."
    • "; + if (!empty($sweetness_display)) $table_assignment_data .= "
  • ".$sweetness_display."
    • "; + if (!empty($sweetness_level_display)) $table_assignment_data .= "
  • ".$sweetness_level_display."
    • "; + if (!empty($allergen_display)) $table_assignment_data .= "
  • ".$allergen_display."
    • "; + if (!empty($abv_display)) $table_assignment_data .= "
  • ".$abv_display."%
    • "; + if (!empty($juice_src_display)) $table_assignment_data .= "
  • ".$juice_src_display."
    • "; + if (!empty($strength_display)) $table_assignment_data .= "
  • ".$strength_display."
    • "; + $table_assignment_data .= "
"; } - $table_assignment_data .= "		".$notes."".$eval_place_actions.$actions."
"; $table_flight_tbody .= "

 

"; $table_flight_tbody .= "		"; if ($view == "entry") $table_flight_tbody .= sprintf("%06s",$row_entries['id']); else $table_flight_tbody .= sprintf("%06s",$row_entries['brewJudgingNumber']); $table_flight_tbody .= ""; if ($_SESSION['prefsStyleSet'] == "BA") $table_flight_tbody .= $row_entries['brewStyle']; else $table_flight_tbody .= $style." ".$row_entries['brewStyle']."
".style_convert($row_entries['brewCategorySort'],1,$base_url).""; @@ -1095,14 +1102,14 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -1125,7 +1132,7 @@ if ($row_entries) { - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; do { @@ -1136,10 +1143,12 @@ $table_flight_tbody .= "		"; $table_flight_tbody .= "

 

"; $table_flight_tbody .= "		"; if ($view == "entry") $table_flight_tbody .= sprintf("%06s",$row_entries['id']); else $table_flight_tbody .= sprintf("%06s",$row_entries['brewJudgingNumber']); $table_flight_tbody .= ""; if ($_SESSION['prefsStyleSet'] == "BA") $table_flight_tbody .= $row_entries['brewStyle']; else $table_flight_tbody .= $style." ".$row_entries['brewStyle']."
".style_convert($row_entries['brewCategorySort'],1,$base_url).""; @@ -1316,14 +1325,14 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -1364,10 +1373,12 @@ $table_flight_tbody .= "		"; $table_flight_tbody .= "

 

"; $table_flight_tbody .= "		"; if ($view == "entry") $table_flight_tbody .= sprintf("%06s",$row_entries['id']); else $table_flight_tbody .= sprintf("%06s",$row_entries['brewJudgingNumber']); $table_flight_tbody .= ""; if ($_SESSION['prefsStyleSet'] == "BA") $table_flight_tbody .= $row_entries['brewStyle']; else $table_flight_tbody .= $style." ".$row_entries['brewStyle']."
".style_convert($row_entries['brewCategorySort'],1,$base_url).""; @@ -1542,14 +1553,14 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - if ($filter != "mini_bos") $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + if ($filter != "mini_bos") $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -1568,7 +1579,7 @@ foreach (array_unique($a) as $value) { include (DB.'output_pullsheets_entries.db.php'); - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; do { @@ -1746,13 +1757,13 @@ $pullsheet_output .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $pullsheet_output .= "\"bProcessing\" : false,"; $pullsheet_output .= "\"aoColumns\": ["; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] },"; - $pullsheet_output .= "{ \"asSorting\": [ ] }"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null,"; + $pullsheet_output .= "null"; $pullsheet_output .= "]"; $pullsheet_output .= "} );"; $pullsheet_output .= "} );"; @@ -1796,14 +1807,14 @@ $table_flight_datatables .= "\"aaSorting\": [[2,'asc'],[1,'asc']],"; $table_flight_datatables .= "\"bProcessing\" : false,"; $table_flight_datatables .= "\"aoColumns\": ["; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] },"; - $table_flight_datatables .= "{ \"asSorting\": [ ] }"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null,"; + $table_flight_datatables .= "null"; $table_flight_datatables .= "]"; $table_flight_datatables .= "} );"; $table_flight_datatables .= "} );"; @@ -1828,7 +1839,7 @@ if (!empty($row_entries)) { - $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],0); + $style = style_number_const($row_entries['brewCategorySort'],$row_entries['brewSubCategory'],$_SESSION['style_set_display_separator'],1); $style_special = $row_entries['brewCategorySort']."^".$row_entries['brewSubCategory']."^".$_SESSION['prefsStyleSet']; do {