Address Issue #1244 and #1236; Barcode Scanning Bug

admin/barcode_check-in.admin.php

@@ -22,20 +22,32 @@
 }
 ?>
 <script type="text/javascript">
+
 function moveOnMax(field,nextFieldID){
   if(field.value.length >= field.maxLength){
     document.getElementById(nextFieldID).focus();
   }
 }
+
 function moveOnCheck(field,nextFieldID){
     document.getElementById(nextFieldID).focus();
 }
-document.form1.first.focus();
+
 var p = false;
 
+/**
+ * Disable return key.
+ * Most scanners are programmed to submit
+ * after a barcode reaches its end. JS here
+ * attempts to prevent that.
+ */
 $(function() {
     $("form").bind("keypress", function(e) {
         if (e.keyCode == 13) return false;
+        if (e.keyCode == 10) return false;
+        if (e.which == '10' || e.which == '13') {
+            e.preventDefault();
+        }
     });
 });
 </script>

admin/judging_tables.admin.php

@@ -191,10 +191,15 @@
             else $scored = $scored;
         }
 
-        else $scored = "N/A <small>(Planning Mode)</em></small>";
+        else $scored = "<i class=\"text-danger fa fas fa-lg fa-ban\"></i> <small><em>Planning Mode</em></small>";
 
         $assigned_judges = assigned_judges($row_tables['id'],$dbTable,$judging_assignments_db_table);
+        //if (strpos($assigned_judges, "fa-plus-circle") === FALSE) 
+            $assigned_judges .= "<button class=\"btn-link\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Delete all judge assignments for this table.\" onclick=\"purge_data('".$base_url."','purge','judge-assignments','table-admin','delete-judges-".$row_tables['id']."');\"><i class=\"text-danger fas fa-lg fa-minus-circle\"></i></button><div><span class=\"hidden\" id=\"delete-judges-".$row_tables['id']."-status\"></span><span class=\"hidden\" id=\"delete-judges-".$row_tables['id']."-status-msg\"></span></div>";
+
         $assigned_stewards = assigned_stewards($row_tables['id'],$dbTable,$judging_assignments_db_table);
+        //if (strpos($assigned_stewards, "fa-plus-circle") === FALSE) 
+            $assigned_stewards .= "<button class=\"btn-link\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Delete all steward assignments for this table.\" onclick=\"purge_data('".$base_url."','purge','steward-assignments','table-admin','delete-stewards-".$row_tables['id']."');\"><i class=\"text-danger fas fa-lg fa-minus-circle\"></i></button><div><span class=\"hidden\" id=\"delete-stewards-".$row_tables['id']."-status\"></span><span class=\"hidden\" id=\"delete-stewards-".$row_tables['id']."-status-msg\"></span></div>";
 
         if ($dbTable == "default") {
             if (score_count($row_tables['id'],1,$dbTable)) $scoreAction = "edit";
@@ -641,6 +646,43 @@ function enable_competition_mode() {
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+
+<!-- Delete assignments modals -->
+<div class="modal fade" id="delete-all-judges" tabindex="-1" role="dialog" aria-labelledby="delete-all-judgesLabel">
+    <div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="delete-all-judgesLabel">Please Confirm</h4>
+        </div>
+        <div class="modal-body">
+            <p>Are you sure you want to delete ALL judge assignments? This cannot be undone.</p>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
+            <button type="button" class="btn btn-success" data-dismiss="modal" onclick="purge_data('<?php echo $base_url; ?>','','tables','admin-dashboard','purge-table');">Yes</button>
+        </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="delete-all-stewards" tabindex="-1" role="dialog" aria-labelledby="delete-all-stewardsLabel">
+    <div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="delete-all-stewardsLabel">Please Confirm</h4>
+        </div>
+        <div class="modal-body">
+            <p>Are you sure you want to delete ALL steward assignments? This cannot be undone.</p>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
+            <button type="button" class="btn btn-success" data-dismiss="modal" onclick="purge_data('<?php echo $base_url; ?>','','tables','admin-dashboard','purge-table');">Yes</button>
+        </div>
+        </div>
+    </div>
+</div>
+
 <?php } ?>
 <p class="lead"><?php echo $_SESSION['contestName'].$title;  ?></p>
 <?php if ($dbTable == "default") { ?>
@@ -1393,4 +1435,5 @@ function update_table_total(element_id) {
     </ul>
 </div>
 <?php } ?>
+<script src="<?php echo $base_url;?>js_includes/admin_ajax.min.js"></script>
 <?php if (($action == "assign") && ($filter != "default") && ($id != "default")) include ('judging_assign.admin.php'); ?>

ajax/purge.ajax.php

@@ -1,8 +1,8 @@
 <?php
 ob_start();
-ini_set('display_errors', 1); // Change to 0 for prod.
-ini_set('display_startup_errors', 1); // Change to 0 for prod.
-error_reporting(E_ALL); // Change to error_reporting(0) for prod.
+ini_set('display_errors', 0); // Change to 0 for prod.
+ini_set('display_startup_errors', 0); // Change to 0 for prod.
+error_reporting(0); // Change to error_reporting(0) for prod.
 require('../paths.php');
 require(CONFIG.'bootstrap.php');
 
@@ -39,26 +39,34 @@
 	$status = 9; // Session expired, not enabled, etc.
 }  // END if session is set
 
-$return_json = array(
-	"status" => "$status",
-	"query" => "$sql",
-	"date" => "$display_date",
-	"dom_ct_participants" => "$dom_ct_participants",
-	"dom_ct_participants_entries" => "$dom_ct_participants_entries",
-	"dom_ct_judges_avail" => "$dom_ct_judges_avail",
-	"dom_ct_judges_assigned" => "$dom_ct_judges_assigned",
-	"dom_ct_stewards_avail" => "$dom_ct_stewards_avail",
-	"dom_ct_stewards_assigned" => "$dom_ct_stewards_assigned",
-	"dom_ct_staff_avail" => "$dom_ct_staff_avail",
-	"dom_ct_staff_assigned" => "$dom_ct_staff_assigned",
-	"dom_ct_entries" => "$dom_ct_entries",
-	"dom_ct_entries_unconfirmed" => "$dom_ct_entries_unconfirmed",
-	"dom_ct_entries_paid" => "$dom_ct_entries_paid",
-	"dom_ct_entries_paid_received" => "$dom_ct_entries_paid_received",
-	"dom_total_fees" => "$dom_total_fees",
-	"dom_total_fees_paid" => "$dom_total_fees_paid"
-);
+if (($go == "judge-assignments") || ($go == "judge-assignments")) {
+	$return_json = array(
+		"status" => "$status",
+		"query" => "$sql"
+	);
+}
 
+else {
+	$return_json = array(
+		"status" => "$status",
+		"query" => "$sql",
+		"date" => "$display_date",
+		"dom_ct_participants" => "$dom_ct_participants",
+		"dom_ct_participants_entries" => "$dom_ct_participants_entries",
+		"dom_ct_judges_avail" => "$dom_ct_judges_avail",
+		"dom_ct_judges_assigned" => "$dom_ct_judges_assigned",
+		"dom_ct_stewards_avail" => "$dom_ct_stewards_avail",
+		"dom_ct_stewards_assigned" => "$dom_ct_stewards_assigned",
+		"dom_ct_staff_avail" => "$dom_ct_staff_avail",
+		"dom_ct_staff_assigned" => "$dom_ct_staff_assigned",
+		"dom_ct_entries" => "$dom_ct_entries",
+		"dom_ct_entries_unconfirmed" => "$dom_ct_entries_unconfirmed",
+		"dom_ct_entries_paid" => "$dom_ct_entries_paid",
+		"dom_ct_entries_paid_received" => "$dom_ct_entries_paid_received",
+		"dom_total_fees" => "$dom_total_fees",
+		"dom_total_fees_paid" => "$dom_total_fees_paid"
+	);
+}
 // Return the json
 echo json_encode($return_json);
 mysqli_close($connection);

includes/ajax_functions.inc.php

@@ -1112,8 +1112,7 @@
 	$email = $_GET['email'];
 	if (is_email($email)) echo sprintf("<span class=\"text-success\"><span class=\"fa fa-check-circle\"></span> %s</span>",$alert_email_valid);
 	else echo sprintf("<span class=\"text-danger\"><span class=\"fa fa-exclamation-triangle\"></span> %s</span>",$alert_email_not_valid);
-
-
+
 }
 
 

includes/constants.inc.php

@@ -31,6 +31,62 @@
 // Replaces countries DB table for better performance
 $countries = array("United States","Australia","Canada","Ireland","United Kingdom","Afghanistan","Albania","Algeria","American Samoa","Andorra","Angola","Anguilla","Antarctica","Antigua and Barbuda","Argentina","Armenia","Aruba","Austria","Azerbaijan","Bahamas","Bahrain","Bangladesh","Barbados","Belarus","Belgium","Belize","Benin","Bermuda","Bhutan","Bolivia","Bosnia and Herzegovina","Botswana","Bouvet Island","Brazil","British Indian Ocean Territory","Brunei Darussalam","Bulgaria","Burkina Faso","Burundi","Cambodia","Cameroon","Cape Verde","Cayman Islands","Central African Republic","Chad","Chile","China","Christmas Island","Cocos (Keeling) Islands","Colombia","Comoros","Congo","Congo, The Democratic Republic of The","Cook Islands","Costa Rica","Cote D'ivoire","Croatia","Cuba","Cyprus","Czech Republic","Denmark","Djibouti","Dominica","Dominican Republic","Easter Island","Ecuador","Egypt","El Salvador","Equatorial Guinea","Eritrea","Estonia","Ethiopia","Falkland Islands (Malvinas)","Faroe Islands","Fiji","Finland","France","French Guiana","French Polynesia","French Southern Territories","Gabon","Gambia","Georgia","Germany","Ghana","Gibraltar","Greece","Greenland","Grenada","Guadeloupe","Guam","Guatemala","Guinea","Guinea-bissau","Guyana","Haiti","Heard Island and Mcdonald Islands","Honduras","Hong Kong","Hungary","Iceland","India","Indonesia","Iran","Iraq","Israel","Italy","Jamaica","Japan","Jordan","Kazakhstan","Kenya","Kiribati","Korea, North","Korea, South","Kosovo","Kuwait","Kyrgyzstan","Laos","Latvia","Lebanon","Lesotho","Liberia","Libyan Arab Jamahiriya","Liechtenstein","Lithuania","Luxembourg","Macau","Macedonia","Madagascar","Malawi","Malaysia","Maldives","Mali","Malta","Marshall Islands","Martinique","Mauritania","Mauritius","Mayotte","Mexico","Micronesia, Federated States of","Moldova, Republic of","Monaco","Mongolia","Montenegro","Montserrat","Morocco","Mozambique","Myanmar","Namibia","Nauru","Nepal","Netherlands","Netherlands Antilles","New Caledonia","New Zealand","Nicaragua","Niger","Nigeria","Niue","Norfolk Island","Northern Mariana Islands","Norway","Oman","Pakistan","Palau","Palestinian Territory","Panama","Papua New Guinea","Paraguay","Peru","Philippines","Pitcairn","Poland","Portugal","Puerto Rico","Qatar","Reunion","Romania","Russia","Russia","Rwanda","Saint Helena","Saint Kitts and Nevis","Saint Lucia","Saint Pierre and Miquelon","Saint Vincent and The Grenadines","Samoa","San Marino","Sao Tome and Principe","Saudi Arabia","Senegal","Serbia and Montenegro","Seychelles","Sierra Leone","Singapore","Slovakia","Slovenia","Solomon Islands","Somalia","South Africa","South Georgia/South Sandwich Islands","Spain","Sri Lanka","Sudan","Suriname","Svalbard and Jan Mayen","Swaziland","Sweden","Switzerland","Syria","Taiwan","Tajikistan","Tanzania, United Republic of","Thailand","Timor-leste","Togo","Tokelau","Tonga","Trinidad and Tobago","Tunisia","Turkey","Turkmenistan","Turks and Caicos Islands","Tuvalu","Uganda","Ukraine","United Arab Emirates","United States Minor Outlying Islands","Uruguay","Uzbekistan","Vanuatu","Vatican City","Venezuela","Vietnam","Virgin Islands, British","Virgin Islands, U.S.","Wallis and Futuna","Western Sahara","Yemen","Zambia","Zimbabwe","Other");
 
+$us_state_abbrevs_names = array(
+    'AL' => 'Alabama',
+    'AK' => 'Alaska',
+    'AZ' => 'Arizona',
+    'AR' => 'Arkansas',
+    'CA' => 'California',
+    'CO' => 'Colorado',
+    'CT' => 'Connecticut',
+    'DE' => 'Delaware',
+    'DC' => 'District of Columbia',
+    'FL' => 'Florida',
+    'GA' => 'Georgia',
+    'HI' => 'Hawaii',
+    'ID' => 'Idaho',
+    'IL' => 'Illinois',
+    'IN' => 'Indiana',
+    'IA' => 'Iowa',
+    'KS' => 'Kansas',
+    'KY' => 'Kentucky',
+    'LA' => 'Louisiana',
+    'ME' => 'Maine',
+    'MD' => 'Maryland',
+    'MA' => 'Massachusetts',
+    'MI' => 'Michigan',
+    'MN' => 'Minnesota',
+    'MS' => 'Mississippi',
+    'MO' => 'Missouri',
+    'MT' => 'Montana',
+    'NE' => 'Nebraska',
+    'NV' => 'Nevada',
+    'NH' => 'New Hampshire',
+    'NJ' => 'New Jersey',
+    'NM' => 'New Mexico',
+    'NY' => 'New York',
+    'NC' => 'North Carolina',
+    'ND' => 'North Dakota',
+    'OH' => 'Ohio',
+    'OK' => 'Oklahoma',
+    'OR' => 'Oregon',
+    'PA' => 'Pennsylvania',
+    'PR' => 'Puerto Rico',
+    'RI' => 'Rhode Island',
+    'SC' => 'South Carolina',
+    'SD' => 'South Dakota',
+    'TN' => 'Tennessee',
+    'TX' => 'Texas',
+    'UT' => 'Utah',
+    'VT' => 'Vermont',
+    'VI' => 'Virgin Islands',
+    'VA' => 'Virginia',
+    'WA' => 'Washington',
+    'WV' => 'West Virginia',
+    'WI' => 'Wisconsin',
+    'WY' => 'Wyoming'
+);
+
 // -------------------------- Tie break rules ---------------------------------------------------
 // List of existing rules for the tie break for ordering the best brewers.
 // The order of the rules will be chosen during setup
@@ -1436,6 +1492,7 @@
     "Miami Beach Home Brew",
     "Miami County Brewing Club",
     "Michiana Extract & Grain Association (MEGA)",
+    "Michigan Mead Coalition",
     "Michigan Occasional Brewers (MOB)",
     "Mid Columbia Zymurgy Association",
     "Mid Michigan Ale and Lager Team (MMALT)",

includes/current_version.inc.php

@@ -10,7 +10,7 @@
 if (!empty($current_version_display_append)) $current_version_display .= " ".$current_version_display_append;
 
 // Change date for each pre-release and release. Will trigger a force update.
-$current_version_date_display = "2021-10-15";
+$current_version_date_display = "2021-10-22";
 
 // Convert current version date to Unix timestamp
 $current_version_date = strtotime($current_version_date_display);

includes/data_cleanup.inc.php

@@ -345,6 +345,32 @@
 
 		} // END if (($go == "tables") || ($go == "purge-all"))
 
+		if ($go == "judge-assignments") {
+
+			if ($view != "default") {
+				$view = explode("-",$view);
+				$updateSQL = sprintf("DELETE FROM %s WHERE assignTable='%s' AND assignment='J'",$judging_assignments_db_table,$view[2]);
+			}
+			else $updateSQL = sprintf("DELETE FROM %s WHERE assignment='J'",$judging_assignments_db_table);
+			$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection));
+			if ($result) $status = 1;
+			$redirect_go_to = sprintf("Location: %s", $base_url."index.php?section=admin&msg=26");
+
+		} // END if ($go == "judging-assignments")
+
+		if ($go == "steward-assignments") {
+
+			if ($view != "default") {
+				$view = explode("-",$view);
+				$updateSQL = sprintf("DELETE FROM %s WHERE assignTable='%s' AND assignment='S'",$judging_assignments_db_table,$view[2]);
+			}
+			else $updateSQL = sprintf("DELETE FROM %s WHERE assignment='S'",$judging_assignments_db_table);
+			$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection));
+			if ($result) $status = 1;
+			$redirect_go_to = sprintf("Location: %s", $base_url."index.php?section=admin&msg=26");
+
+		} // END if ($go == "judging-assignments")
+
 		if (($go == "custom") || ($go == "purge-all")) {
 
 			$purge_array = array($special_best_info_db_table,$special_best_data_db_table);

includes/db/common.db.php

@@ -5,7 +5,7 @@
 
 mysqli_select_db($connection,$database);
 
-$query_version1 = sprintf("SELECT * FROM %s WHERE id='1'", $prefix."system");
+$query_version1 = sprintf("SELECT * FROM %s WHERE id='1'", $prefix."bcoem_sys");
 $version1 = mysqli_query($connection,$query_version1) or die (mysqli_error($connection));
 $row_version1 = mysqli_fetch_assoc($version1);
 $version = $row_version1['version'];

includes/db/setup.db.php

@@ -1,9 +1,9 @@
 <?php
 mysqli_select_db($connection,$database);
 // Check to see if initial setup has taken place
-if (table_exists($prefix."system")) {
+if (table_exists($prefix."bcoem_sys")) {
 
-	$query_system = sprintf("SELECT setup FROM %s", $prefix."system");
+	$query_system = sprintf("SELECT setup FROM %s", $prefix."bcoem_sys");
 	$system = mysqli_query($connection,$query_system) or die (mysqli_error($connection));
 	$row_system = mysqli_fetch_assoc($system);
 	if ($row_system['setup'] == 1) header (sprintf("Location: %s",$base_url."index.php"));

includes/db/update.db.php

@@ -14,8 +14,8 @@
 $row_log = mysqli_fetch_assoc($log);
 $totalRows_log = mysqli_num_rows($log);
 
-// if "system" db table is present, get installed version from it
-if (check_setup($prefix."system",$database)) { 
+// if "bcoem_sys" db table is present, get installed version from it
+if (check_setup($prefix."bcoem_sys",$database)) { 
 	$query_version = sprintf("SELECT version,version_date FROM %s",$system_db_table);
 	$version = mysqli_query($connection,$query_version) or die (mysqli_error($connection));
 	$row_version = mysqli_fetch_assoc($version);	

includes/db_tables.inc.php

@@ -39,7 +39,7 @@
 	$staff_db_table = $prefix."staff";
 	$styles_db_table = $prefix."styles";
 	$style_types_db_table = $prefix."style_types";
-	$system_db_table = $prefix."system";
+	$system_db_table = $prefix."bcoem_sys";
 	$users_db_table = $prefix."users";
 	}
 else {
@@ -67,7 +67,7 @@
 	$staff_db_table = $prefix."staff";
 	$styles_db_table = $prefix."styles";
 	$style_types_db_table = $prefix."style_types".$suffix;
-	$system_db_table = $prefix."system";
+	$system_db_table = $prefix."bcoem_sys";
 	$users_db_table = $prefix."users".$suffix;
 }
 

includes/email.inc.php

@@ -1082,7 +1082,6 @@
 	return ($diagnose) ? $final_status : ($final_status < ISEMAIL_THRESHOLD);
 }
 $email = $_GET['email'];
-if (is_email($email)) echo sprintf("<span class=\"text-success\"><span class=\"glyphicon glyphicon-ok\"></span> %</span>",$alert_email_valid);
-else echo sprintf("<span class=\"text-danger\"><span class=\"glyphicon glyphicon-exclamation-sign\"></span> %s</span>",$alert_email_not_valid);
-
-?> 
+if (is_email($email)) echo sprintf("<span class=\"text-success\"><i class=\"fa fas fa-check-circle\"></i> %</span>",$alert_email_valid);
+else echo sprintf("<span class=\"text-danger\"><i class=\"fa fas fa-exclamation-triangle\"></i> %s</span>",$alert_email_not_valid);
+?>

includes/process.inc.php

@@ -103,7 +103,7 @@
 	$staff_db_table = $prefix."staff";
 	$styles_db_table = $prefix."styles";
 	$style_types_db_table = $prefix."style_types";
-	$system_db_table = $prefix."system";
+	$system_db_table = $prefix."bcoem_sys";
 	$themes_db_table = $prefix."themes";
 	$users_db_table = $prefix."users";
 

includes/process/process_judging_preferences.inc.php

@@ -84,7 +84,7 @@
 		session_write_close();
 		session_regenerate_id(true);
 
-		$updateSQL = sprintf("UPDATE %s SET setup='1', setup_last_step='8' WHERE id='1'",$prefix."system");
+		$updateSQL = sprintf("UPDATE %s SET setup='1', setup_last_step='8' WHERE id='1'",$prefix."bcoem_sys");
 		mysqli_real_escape_string($connection,$updateSQL);
 		$result = mysqli_query($connection,$updateSQL) or die (mysqli_error($connection));