From 2ab196775e102e2b3a811c4150fe216364650f7e Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Sun, 11 Aug 2024 20:31:07 +0100
Subject: [PATCH 01/44] [9aced63] - v11.0

---
 CHANGELOG.md    | 2 ++
 VERSION.md      | 2 +-
 db/schema.ver   | 2 +-
 releasenotes.md | 9 +--------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba20da30..34b25315 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 # CHANGELOG
+### Version 11.0
+
 ### Version 10.9
 - Sys update check improvements
 - Dashboard page updates
diff --git a/VERSION.md b/VERSION.md
index 73def33c..2dbc24b3 100755
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-10.9
+11.0
diff --git a/db/schema.ver b/db/schema.ver
index 73def33c..2dbc24b3 100644
--- a/db/schema.ver
+++ b/db/schema.ver
@@ -1 +1 @@
-10.9
+11.0
diff --git a/releasenotes.md b/releasenotes.md
index 6132c308..227894a8 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,10 +1,3 @@
-Whats New in v10.9
+Whats New in v11.0
 --------------------------
-- Sell formula PDF export updates
-- Fix a bug causing json import for ingredients to fail
-- Include EINECS when adding ingredient entry from compositions
-- If Prohibition is selected in ingredient usage and limits then the usage values set to 0
-- To Declare option is now moved under Udage and Limits section for ingredients
-- Fix materials not updating corrrectly when added in the cart
-- Added CSV export for cart ingredients
 - This release may include more changes, for full details please refer to the CHANGELOG

From 8e5f1451cbc54ccb38fb364d689a79db6ea1f8cf Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Sun, 11 Aug 2024 21:33:26 +0100
Subject: [PATCH 02/44] [2ab1967] - IFRA structure images import improvements

---
 CHANGELOG.md          |   1 +
 js/import.IFRA.js     |   2 +-
 pages/IFRA.php        | 494 +++++++++++++++++++++---------------------
 pages/update_data.php |  69 +++---
 4 files changed, 293 insertions(+), 273 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34b25315..b28045b0 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- IFRA structure images import improvements
 
 ### Version 10.9
 - Sys update check improvements
diff --git a/js/import.IFRA.js b/js/import.IFRA.js
index 5dc11aca..54b8e4b3 100644
--- a/js/import.IFRA.js
+++ b/js/import.IFRA.js
@@ -93,7 +93,7 @@ $('#btnRestoreIFRA').click(function() {
 				var msg = '<div class="alert alert-success">'+data.success+'</div>';
 				$("#btnRestoreIFRA").hide();
 				$("#backupArea").css('display', 'none');
-
+				$('#tdDataIFRA').DataTable().ajax.reload(null, true);
 			}else if(data.error){
 				var msg = '<div class="alert alert-danger">'+data.error+'</div>';
 				$("#btnRestoreIFRA").show();
diff --git a/pages/IFRA.php b/pages/IFRA.php
index 118f324e..47c070e7 100755
--- a/pages/IFRA.php
+++ b/pages/IFRA.php
@@ -75,7 +75,7 @@
 <!--IFRA IMPORT-->
 <div class="modal fade" id="ifra_import" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="ifra_import" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered modal-ifra" role="document">
-    <div class="modal-content">
+    <div class="modal-content modal-lg">
       <div class="modal-header">
         <h5 class="modal-title" id="ifra_import">Import IFRA xls file</h5>
       </div>
@@ -141,7 +141,7 @@
 <!--PUBCHEM IMPORT-->
 <div class="modal fade" id="pubChem_import" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="pubChem_import" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered modal-pubChem" role="document">
-    <div class="modal-content">
+    <div class="modal-content modal-lg">
       <div class="modal-header">
         <h5 class="modal-title">Import images from PubChem</h5>
       </div>
@@ -205,7 +205,7 @@
 </div>
 </div>
 
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
 	$('#mainTitle').click(function() {
 	 	reload_data();
@@ -213,42 +213,42 @@
    $('[data-bs-toggle="tooltip"]').tooltip();
 
 	var tdDataIFRA = $('#tdDataIFRA').DataTable( {
-	columnDefs: [
-		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [25]},
-		{ responsivePriority: 1, targets: 0 }
-	],
-	dom: 'lrftip',
-	buttons: [{
-			extend: 'csvHtml5',
-			title: "IFRALibrary"
-	}],
-	processing: true,
-	serverSide: true,
-	searching: true,
-	mark: true,
-	responsive: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: '<div class="spinner-grow mx-2"></div>Please Wait...',
-		zeroRecords: 'Nothing found',
-		search: 'Quick Search:',
-		searchPlaceholder: 'Name, CAS, synonyms...',
+		columnDefs: [
+			{ className: 'pv_vertical_middle text-center', targets: '_all' },
+			{ orderable: false, targets: [25]},
+			{ responsivePriority: 1, targets: 0 }
+		],
+		dom: 'lrftip',
+		buttons: [{
+				extend: 'csvHtml5',
+				title: "IFRALibrary"
+		}],
+		processing: true,
+		serverSide: true,
+		searching: true,
+		mark: true,
+		responsive: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: '<div class="spinner-grow mx-2"></div>Please Wait...',
+			zeroRecords: 'Nothing found',
+			search: 'Quick Search:',
+			searchPlaceholder: 'Name, CAS, synonyms...',
 		},
-	ajax: {	
-		url: '/core/list_IFRA_data.php',
-		type: 'POST',
-		dataType: 'json',
-		data: function(d) {
-			if (d.order.length>0){
-				d.order_by = d.columns[d.order[0].column].data
-				d.order_as = d.order[0].dir
-			}
+		ajax: {	
+			url: '/core/list_IFRA_data.php',
+			type: 'POST',
+			dataType: 'json',
+			data: function(d) {
+				if (d.order.length>0){
+					d.order_by = d.columns[d.order[0].column].data
+					d.order_as = d.order[0].dir
+				}
+			 },
 		 },
-	    },
-	   columns: [
+		 columns: [
 			{ data : 'image', title: 'Structure', render: image },
-            { data : 'name', title: 'Name', render: name },
+			{ data : 'name', title: 'Name', render: name },
 			{ data : 'cas', title: 'CAS', render: CAS },
 			{ data : 'amendment', title: 'Amendment' },
 			{ data : 'last_pub', title: 'Last publication' },
@@ -272,33 +272,32 @@
 			{ data : 'cat11A', title: 'Cat11A%' },
 			{ data : 'cat11B', title: 'Cat11B%' },
 			{ data : 'cat12', title: 'Cat12%' },
-			{ data : null, title: '', render: actions },
-
-			],
-	order: [[ 1, 'asc' ]],
-	lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
-	pageLength: 20,
-	displayLength: 20,
-	
-	stateSave: true,
-	stateDuration : -1,
-	stateLoadCallback: function (settings, callback) {
-       	$.ajax( {
-           	url: '/core/update_user_settings.php?set=listIFRA&action=load',
-           	dataType: 'json',
-           	success: function (json) {
-               	callback( json );
-           	}
-       	});
-    },
-    stateSaveCallback: function (settings, data) {
-	   $.ajax({
-		 url: "/core/update_user_settings.php?set=listIFRA&action=save",
-		 data: data,
-		 dataType: "json",
-		 type: "POST"
-	  });
-	},
+			{ data : null, title: '', render: actions }
+		],
+		order: [[ 1, 'asc' ]],
+		lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
+		pageLength: 20,
+		displayLength: 20,
+		
+		stateSave: true,
+		stateDuration : -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listIFRA&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+				}
+			});
+		},
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			 url: "/core/update_user_settings.php?set=listIFRA&action=save",
+			 data: data,
+			 dataType: "json",
+			 type: "POST"
+		  });
+		},
 	
 	});
 
@@ -328,200 +327,203 @@
 		});
 	});
 	
-});
-
-function format ( d ) {
-    details = '<strong>Synonyms:</strong><br><span class="ifra_details">'+d.synonyms+
-	'</span><br><strong>CAS Comment:</strong><br><span class="ifra_details">'+d.cas_comment+
-	'</span><br><strong>Risk:</strong><br><span class="ifra_details">'+d.risk+
-	'</span><br><strong>Specified Notes:</strong><br><span class="ifra_details">'+d.specified_notes+
-	'</span><br><strong>Flavor Use:</strong><br><span class="ifra_details">'+d.flavor_use;
-
-	return details;
-}
-
-function name(data, type, row){
-	return '<i class="pv_point_gen pv_gen_li" id="ifra_name">'+row.name+'</i>';
-}
 
-function CAS(data, type, row){
-	data = '<a href="#" data-name="cas" class="cas" data-type="text" data-pk="' + row.id + '">' + data + '</a>';
-	return data;
-}
 
-function image(data, type, row){
-	return '<img src="data:image/png;base64, '+row.image+'" class="img_ifra"/>';
-}
-
-function reload_data() {
-    $('#tdDataIFRA').DataTable().ajax.reload(null, true);
-}
-
-function actions(data, type, row){
-	data = '<a class="pv_point_gen text-danger" id="dDel" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-trash mx-2"></i></a>';
+	function format ( d ) {
+		details = '<strong>Synonyms:</strong><br><span class="ifra_details">'+d.synonyms+
+		'</span><br><strong>CAS Comment:</strong><br><span class="ifra_details">'+d.cas_comment+
+		'</span><br><strong>Risk:</strong><br><span class="ifra_details">'+d.risk+
+		'</span><br><strong>Specified Notes:</strong><br><span class="ifra_details">'+d.specified_notes+
+		'</span><br><strong>Flavor Use:</strong><br><span class="ifra_details">'+d.flavor_use;
 	
-	return data;
-}
-
-
-$('#exportCSV').click(() => {
-    $('#tdDataIFRA').DataTable().button(0).trigger();
-});
-
-$('#btnImportIFRA').click(function() {	
-	$("#IFRAImportMsg").html('<div class="alert alert-info"><img src="/img/loading.gif" class="mx-2"/>Please wait, file upload in progress....</div>');
-	$("#btnImportIFRA").prop("disabled", true);
-	$("#btnIFRAC").prop("disabled", true);
-
+		return details;
+	};
 	
-	var fd = new FormData();
-    var files = $('#ifraXLS')[0].files;
-    var modify = $('#updateCAS').prop("checked");
-    var overwrite = $('#overwrite').prop("checked");
-    var IFRAver = $('#IFRAver').val();
-
-       if(files.length > 0 ){
-        fd.append('ifraXLS',files[0]);
-        $.ajax({
-           url: '/pages/upload.php?type=IFRA&updateCAS=' + modify + '&overwrite='+ overwrite + '&IFRAVer=' + IFRAver,
-           type: 'POST',
-           data: fd,
-           contentType: false,
-           processData: false,
-		         cache: false,
-		   dataType: 'json',
-           success: function(response){
-             if(response.success){
-				 $("#IFRAImportMsg").html('<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.success+'</div>');
-				// $("#btnImportIFRA").hide();
-				 $("#btnIFRAC").html('Close');
-				 $("#btnImportIFRA").prop("disabled", false);
-				 $("#btnIFRAC").prop("disabled", false);
-				 $("#ifraXLS").val('');
-				 reload_data();
-              }else{
-                $("#IFRAImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.error+'</div>');
-				$("#btnImportIFRA").prop("disabled", false);
-				$("#btnIFRAC").prop("disabled", false);
-              }
-            },
-         });
-  }else{
-	$("#IFRAImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>Error:</strong> Please select a file to upload!</div>');
-	$("#btnImportIFRA").prop("disabled", false);
-  }	
-});
-
-$('#Importpb').click(function() {	
-	$("#pbmportMsg").html('<div class="alert alert-info"><img src="/img/loading.gif" class="mx-2"/>Please wait, this may take a few minutes, depending your IFRA library size and your internet connection...</div>');
-	$("#Importpb").prop("disabled", true);
-	$("#ImportpbC").hide();
-
-	$.ajax({
-		url: '/pages/update_data.php', 
-		type: 'GET',
-		data: {
-			IFRA_PB: "import",
+	function name(data, type, row){
+		return '<i class="pv_point_gen pv_gen_li" id="ifra_name">'+row.name+'</i>';
+	};
+	
+	function CAS(data, type, row){
+		data = '<a href="#" data-name="cas" class="cas" data-type="text" data-pk="' + row.id + '">' + data + '</a>';
+		return data;
+	};
+	
+	function image(data, type, row){
+		return '<img src="data:image/png;base64, '+row.image+'" class="img_ifra"/>';
+	};
+	
+	function reload_data() {
+		$('#tdDataIFRA').DataTable().ajax.reload(null, true);
+	};
+	
+	function actions(data, type, row){
+		data = '<a class="pv_point_gen text-danger" id="dDel" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-trash mx-2"></i></a>';
+		
+		return data;
+	};
+	
+	
+	$('#exportCSV').click(() => {
+		$('#tdDataIFRA').DataTable().button(0).trigger();
+	});
+	
+	$('#btnImportIFRA').click(function() {	
+		$("#IFRAImportMsg").html('<div class="alert alert-info"><img src="/img/loading.gif" class="mx-2"/>Please wait, file upload in progress....</div>');
+		$("#btnImportIFRA").prop("disabled", true);
+		$("#btnIFRAC").prop("disabled", true);
+	
+		
+		var fd = new FormData();
+		var files = $('#ifraXLS')[0].files;
+		var modify = $('#updateCAS').prop("checked");
+		var overwrite = $('#overwrite').prop("checked");
+		var IFRAver = $('#IFRAver').val();
+	
+		if(files.length > 0 ){
+			fd.append('ifraXLS',files[0]);
+			$.ajax({
+			   url: '/pages/upload.php?type=IFRA&updateCAS=' + modify + '&overwrite='+ overwrite + '&IFRAVer=' + IFRAver,
+			   type: 'POST',
+			   data: fd,
+			   contentType: false,
+			   processData: false,
+			   cache: false,
+			   dataType: 'json',
+			   success: function(response){
+				 if(response.success){
+					 $("#IFRAImportMsg").html('<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.success+'</div>');
+					// $("#btnImportIFRA").hide();
+					 $("#btnIFRAC").html('Close');
+					 $("#btnImportIFRA").prop("disabled", false);
+					 $("#btnIFRAC").prop("disabled", false);
+					 $("#ifraXLS").val('');
+					 reload_data();
+				  }else{
+					$("#IFRAImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.error+'</div>');
+					$("#btnImportIFRA").prop("disabled", false);
+					$("#btnIFRAC").prop("disabled", false);
+				  }
+				},
+			});
+	  }else{
+		$("#IFRAImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>Error:</strong> Please select a file to upload!</div>');
+		$("#btnImportIFRA").prop("disabled", false);
+	  }	
+	});
+	
+	$('#Importpb').click(function() {	
+		$("#pbmportMsg").html('<div class="alert alert-info"><img src="/img/loading.gif" class="mx-2"/>Please wait, this may take a few minutes, depending your IFRA library size and your internet connection...</div>');
+		$("#Importpb").prop("disabled", true);
+		$("#ImportpbC").hide();
+	
+		$.ajax({
+			url: '/pages/update_data.php', 
+			type: 'GET',
+			data: {
+				IFRA_PB: "import",
 			},
-		dataType: 'json',
-		success: function (data) {
-			if(data.success){				
-				$('#pbmportMsg').html('<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.success+'</div>');
-				$("#Importpb").hide();
-				$("#ImportpbC").show();
-				$('#ImportpbC').html('Close');
-				$("#ImportpC").show();
-				reload_data();
-			}else{
-				$('#pbmportMsg').html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.error+'</div>');
-				$("#Importpb").show();
-				$("#ImportpbC").show();
-				$("#Importpb").prop("disabled", false);
-				$("#ImportpC").show();
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){				
+					$('#pbmportMsg').html('<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.success+'</div>');
+					$("#Importpb").hide();
+					$("#ImportpbC").show();
+					$('#ImportpbC').html('Close');
+					$("#ImportpC").show();
+					$("#Importpb").prop("disabled", false);
+					reload_data();
+				}else{
+					$('#pbmportMsg').html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.error+'</div>');
+					$("#Importpb").show();
+					$("#ImportpbC").show();
+					$("#Importpb").prop("disabled", false);
+					$("#ImportpC").show();
+				}
 			}
+		});
+	});
+	
+	
+	$("#overwrite-msg").hide();
+	
+	$("#overwrite").click(function() {
+		if($(this).is(":checked")) {
+			$("#overwrite-msg").show();
+		} else {
+			$("#overwrite-msg").hide();
 		}
 	});
-});
-
-
-$("#overwrite-msg").hide();
-
-$("#overwrite").click(function() {
-    if($(this).is(":checked")) {
-        $("#overwrite-msg").show();
-    } else {
-        $("#overwrite-msg").hide();
-    }
-});
-
-$('#tdDataIFRA').on('click', '[id*=dDel]', function () {
-	var d = {};
-	d.ID = $(this).attr('data-id');
-    d.Name = $(this).attr('data-name');
-
-	bootbox.dialog({
-       title: "Confirm deletion",
-       message : 'Delete IFRA entry <strong>'+ d.Name +'</strong> ?',
-       buttons :{
-           main: {
-               label : "Delete",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						IFRA: 'delete',
-						ID: d.ID,
-						type: 'IFRA'
+	
+	$('#tdDataIFRA').on('click', '[id*=dDel]', function () {
+		var d = {};
+		d.ID = $(this).attr('data-id');
+		d.Name = $(this).attr('data-name');
+	
+		bootbox.dialog({
+		   title: "Confirm deletion",
+		   message : 'Delete IFRA entry <strong>'+ d.Name +'</strong> ?',
+		   buttons :{
+			   main: {
+				   label : "Delete",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							IFRA: 'delete',
+							ID: d.ID,
+							type: 'IFRA'
 						},
-					dataType: 'json',
-					success: function (data) {
-						if(data.success){
-							msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
-							reload_data();
-						}else if(data.error){
-							msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+						dataType: 'json',
+						success: function (data) {
+							if(data.success){
+								msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+								reload_data();
+							}else if(data.error){
+								msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+							}
+							$('#iframsg').html(msg);
 						}
-						$('#iframsg').html(msg);
-					}
-				  });
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
+					  });
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	$('#tdDataIFRA').editable({
+	  container: 'body',
+	  selector: 'a.cas',
+	  url: "/pages/update_data.php?IFRA=edit&type=CAS",
+	  title: 'CAS#',
+	  ajaxOptions: { 
+		dataType: 'json'
+	  },
+	  success: function(response, newValue) {
+		if(response.error){
+			return response.error; 
+		}else{ 
+			reload_data();
+		}
+	  },
+	  validate: function(value){
+		  	if($.trim(value) == ''){
+				return 'This field is required';
+			}
+	  	}
+	});
 
-$('#tdDataIFRA').editable({
-  container: 'body',
-  selector: 'a.cas',
-  url: "/pages/update_data.php?IFRA=edit&type=CAS",
-  title: 'CAS#',
-  ajaxOptions: { 
-  	dataType: 'json'
-  },
-  success: function(response, newValue) {
-	if(response.error){
-		return response.error; 
-	}else{ 
-		reload_data();
-	}
-  },
-  validate: function(value){
-   if($.trim(value) == ''){
-	return 'This field is required';
-   }
-  }
 });
 </script>
 <script src="/js/mark/jquery.mark.min.js"></script>
diff --git a/pages/update_data.php b/pages/update_data.php
index c20c7352..b7d9d00d 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -659,35 +659,52 @@
 }
 
 //IMPORT IMAGES FROM PUBCHEM
-if($_GET['IFRA_PB'] == 'import'){
-	require_once(__ROOT__.'/func/pvFileGet.php');
-	$i = 0;
-	$qCas = mysqli_query($conn,"SELECT cas FROM IFRALibrary WHERE image IS NULL OR image = '' OR image = '-'");
+if(isset($_GET['IFRA_PB']) && $_GET['IFRA_PB'] === 'import'){
+    require_once(__ROOT__.'/func/pvFileGet.php');
+    
+    $i = 0;
+    $response = [];
 
-	if(!mysqli_num_rows($qCas)){
-		$response["error"] = 'IFRA Database is currently empty';
-		echo json_encode($response);
-		return;
-	}
-	
-	$view =  $settings['pubchem_view'];
-	while($cas = mysqli_fetch_array($qCas)){
-		$image = base64_encode(pv_file_get_contents($pubChemApi.'/pug/compound/name/'.trim($cas['cas']).'/PNG?record_type='.$view.'&image_size=small'));
-		
-		$imp = mysqli_query($conn,"UPDATE IFRALibrary SET image = '$image' WHERE cas = '".$cas['cas']."'");
-		$i++;
-		
-		usleep(.1 * 1000000);
-	}
-	if($imp){
-		$response["success"] = $i.' images updated!';
-	}else{
-		$response["error"] = 'Something went wrong '.mysqli_error($conn);
-	}
-	echo json_encode($response);
-	return;
+    $qCas = mysqli_query($conn, "SELECT cas FROM IFRALibrary WHERE image IS NULL OR image = '' OR image = '-'");
+
+    if(!$qCas || mysqli_num_rows($qCas) == 0){
+        $response["error"] = 'IFRA Database is currently empty or there was a problem with the query.';
+        echo json_encode($response);
+        return;
+    }
+
+    $view = $settings['pubchem_view'];
+
+    while($cas = mysqli_fetch_assoc($qCas)){
+        $casNumber = trim($cas['cas']);
+        $imageUrl = $pubChemApi.'/pug/compound/name/'.$casNumber.'/PNG?record_type='.$view.'&image_size=small';
+        $imageContent = pv_file_get_contents($imageUrl);
+        
+        if($imageContent !== false){
+            $image = base64_encode($imageContent);
+            $stmt = $conn->prepare("UPDATE IFRALibrary SET image = ? WHERE cas = ?");
+            $stmt->bind_param('ss', $image, $casNumber);
+
+            if($stmt->execute()){
+                $i++;
+            } else {
+                $response["error"] = 'Error updating image for CAS: '.$casNumber.' - '.mysqli_error($conn);
+                echo json_encode($response);
+                return;
+            }
+
+            $stmt->close();
+        }
+
+        usleep(100000); // 0.1 seconds delay
+    }
+
+    $response["success"] = $i.' images updated!';
+    echo json_encode($response);
+    return;
 }
 
+
 //Update data FROM PubChem
 if($_POST['pubChemData'] == 'update' && $_POST['cas']){
 	$cas = trim($_POST['cas']);

From 6c0961cbf2b57949d1f72a7742baa2724b804083 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Sun, 11 Aug 2024 21:36:04 +0100
Subject: [PATCH 03/44] [8e5f145] - IFRA structure images import improvements

---
 pages/IFRA.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/IFRA.php b/pages/IFRA.php
index 47c070e7..80108395 100755
--- a/pages/IFRA.php
+++ b/pages/IFRA.php
@@ -10,7 +10,6 @@
               <h2 class="m-0 font-weight-bold text-primary-emphasis"><a href="#" id="mainTitle">IFRA Library</a></h2>
             </div>
             <div class="card-body">
-               <div id="iframsg"></div>
                   <div class="text-right">
                     <div class="btn-group">
                       <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
@@ -479,12 +478,14 @@ className : "btn-danger",
 						dataType: 'json',
 						success: function (data) {
 							if(data.success){
-								msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
 								reload_data();
 							}else if(data.error){
-								msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
 							}
-							$('#iframsg').html(msg);
+							$('.toast').toast('show');
 						}
 					  });
 					

From 98959cfbd651d7b51ec34742f12448a03d0800cc Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Sun, 11 Aug 2024 21:48:51 +0100
Subject: [PATCH 04/44] [6c0961c] - bootstrap-select class update

---
 js/bootstrap-select.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
index e4e2b990..732247a8 100755
--- a/js/bootstrap-select.js
+++ b/js/bootstrap-select.js
@@ -952,7 +952,7 @@
     this.init();
   };
 
-  Selectpicker.VERSION = '1.14.0-beta3';
+  Selectpicker.VERSION = '1.14.0-beta3';//PV MODIFIED
 
   // part of this is duplicated in i18n/defaults-en_US.js. Make sure to update both.
   Selectpicker.DEFAULTS = {
@@ -976,7 +976,7 @@
     doneButton: false,
     doneButtonText: 'Close',
     multipleSeparator: ', ',
-    styleBase: 'btn',
+    styleBase: '',
     style: classNames.BUTTONCLASS,
     size: 'auto',
     title: null,

From b5ae7540985e683f5ecb2410587388a1612e0585 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 09:49:12 +0100
Subject: [PATCH 05/44] [98959cf] - Removed deprecated version value from the
 docker-compose

---
 README.md                   | 1 -
 docker-compose/compose.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 42943dcd..0b169329 100755
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ Please note, all DB_ variables are required.
 or via docker compose
 
 	---
-	version: '3.8'
 	services:
 	  pvdb:
 	    image: mariadb:10.5
diff --git a/docker-compose/compose.yaml b/docker-compose/compose.yaml
index f0f2239f..5582e0cd 100644
--- a/docker-compose/compose.yaml
+++ b/docker-compose/compose.yaml
@@ -1,5 +1,4 @@
 ---
-version: '3.8'
 services:
   pvdb:
     image: mariadb:10.5

From 089fa55361569e01a1ca17511fc596bac17bd5cf Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 11:47:12 +0100
Subject: [PATCH 06/44] [b5ae754] - Treat empty IFRA Library values
 (PROHIBITION, SPECIFICATION) as 0% allowed

---
 CHANGELOG.md                    |  1 +
 core/full_formula_data.php      |  2 +-
 db/updates/update_10.9-11.0.sql |  2 ++
 func/fixIFRACas.php             | 52 ++++++++++++++++-----------------
 func/searchIFRA.php             |  6 +++-
 pages/IFRA.php                  |  2 +-
 pages/viewFormula.php           |  2 +-
 releasenotes.md                 |  1 +
 8 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 db/updates/update_10.9-11.0.sql

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b28045b0..7f9ba93d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - IFRA structure images import improvements
 
 ### Version 10.9
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index bab7e72c..e6254c4e 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -195,7 +195,7 @@
 	$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
 	
 	if(($u['0'] && $ing_q['byPassIFRA'] == 0)){
-		$r['usage_limit'] = number_format((float)$u['0']?:100, $settings['qStep']);
+		$r['usage_limit'] = (float)number_format((float)$u['0'], $settings['qStep']);
 		$r['usage_restriction'] = (string)$u['1'] ?: 'N/A';
 		$r['usage_regulator'] = (string)"IFRA";
 	}else{
diff --git a/db/updates/update_10.9-11.0.sql b/db/updates/update_10.9-11.0.sql
new file mode 100644
index 00000000..e925aa14
--- /dev/null
+++ b/db/updates/update_10.9-11.0.sql
@@ -0,0 +1,2 @@
+TRUNCATE IFRALibrary;
+ALTER TABLE `IFRALibrary` CHANGE `cat1` `cat1` FLOAT NOT NULL DEFAULT '0', CHANGE `cat2` `cat2` FLOAT NOT NULL DEFAULT '0', CHANGE `cat3` `cat3` FLOAT NOT NULL DEFAULT '0', CHANGE `cat4` `cat4` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5A` `cat5A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5B` `cat5B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5C` `cat5C` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5D` `cat5D` FLOAT NOT NULL DEFAULT '0', CHANGE `cat6` `cat6` FLOAT NOT NULL DEFAULT '0', CHANGE `cat7A` `cat7A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat7B` `cat7B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat8` `cat8` FLOAT NOT NULL DEFAULT '0', CHANGE `cat9` `cat9` FLOAT NOT NULL DEFAULT '0', CHANGE `cat10A` `cat10A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat10B` `cat10B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat11A` `cat11A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat11B` `cat11B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat12` `cat12` FLOAT NOT NULL DEFAULT '0';
diff --git a/func/fixIFRACas.php b/func/fixIFRACas.php
index 7d5439f4..a547d45c 100644
--- a/func/fixIFRACas.php
+++ b/func/fixIFRACas.php
@@ -1,27 +1,27 @@
-<?php 
-if (!defined('pvault_panel')){ die('Not Found');}
-
-function fixIFRACas($conn){
-		$q0 = mysqli_query($conn, "SELECT id,cas FROM IFRALibrary WHERE cas REGEXP '^[a-zA-Z().]'");
-		while($f = mysqli_fetch_array($q0)){
-			$r = preg_replace("/^\s/", "",preg_replace("/\s+/", "\n",preg_replace("/[^0-9,\-,\n]/", "", $f['cas'])));
-			mysqli_query($conn, "UPDATE IFRALibrary SET cas = '$r2' WHERE id = '".$f['id']."'");
-		}
-
-	
-		$q1 = mysqli_query($conn, "SELECT id,ifra_key,cas FROM IFRALibrary WHERE cas REGEXP '\n'");
-		$fields = 'ifra_key,image,amendment,prev_pub,last_pub,deadline_existing,deadline_new,name,cas,cas_comment,synonyms,formula,flavor_use,prohibited_notes,restricted_photo_notes,restricted_notes,specified_notes,type,risk,contrib_others,contrib_others_notes,cat1,cat2,cat3,cat4,cat5A,cat5B,cat5C,cat5D,cat6,cat7A,cat7B,cat8,cat9,cat10A,cat10B,cat11A,cat11B,cat12';
-	
-		while($r =  mysqli_fetch_array($q1)){
-			$e = explode("\n",$r['cas']);
-			foreach($e as $value){
-		
-				$n = "INSERT INTO IFRALibrary ($fields) SELECT  ifra_key,image,amendment,prev_pub,last_pub,deadline_existing,deadline_new,name,'$value',cas_comment,synonyms,formula,flavor_use,prohibited_notes,restricted_photo_notes,restricted_notes,specified_notes,type,risk,contrib_others,contrib_others_notes,cat1,cat2,cat3,cat4,cat5A,cat5B,cat5C,cat5D,cat6,cat7A,cat7B,cat8,cat9,cat10A,cat10B,cat11A,cat11B,cat12 FROM IFRALibrary WHERE id = '".$r['id']."'";
-				mysqli_query($conn, $n);
-			}
-		}
-		mysqli_query($conn, "DELETE FROM IFRALibrary WHERE cas REGEXP '\n'");
-		mysqli_query($conn, "DELETE FROM IFRALibrary WHERE name = '' OR ifra_key = 'Key|String'");
-		
-}
+<?php 
+if (!defined('pvault_panel')){ die('Not Found');}
+
+function fixIFRACas($conn){
+		$q0 = mysqli_query($conn, "SELECT id,cas FROM IFRALibrary WHERE cas REGEXP '^[a-zA-Z().]'");
+		while($f = mysqli_fetch_array($q0)){
+			$r = preg_replace("/^\s/", "",preg_replace("/\s+/", "\n",preg_replace("/[^0-9,\-,\n]/", "", $f['cas'])));
+			mysqli_query($conn, "UPDATE IFRALibrary SET cas = '$r2' WHERE id = '".$f['id']."'");
+		}
+
+	
+		$q1 = mysqli_query($conn, "SELECT id,ifra_key,cas FROM IFRALibrary WHERE cas REGEXP '\n'");
+		$fields = 'ifra_key,image,amendment,prev_pub,last_pub,deadline_existing,deadline_new,name,cas,cas_comment,synonyms,formula,flavor_use,prohibited_notes,restricted_photo_notes,restricted_notes,specified_notes,type,risk,contrib_others,contrib_others_notes,cat1,cat2,cat3,cat4,cat5A,cat5B,cat5C,cat5D,cat6,cat7A,cat7B,cat8,cat9,cat10A,cat10B,cat11A,cat11B,cat12';
+	
+		while($r =  mysqli_fetch_array($q1)){
+			$e = explode("\n",$r['cas']);
+			foreach($e as $value){
+		
+				$n = "INSERT INTO IFRALibrary ($fields) SELECT  ifra_key,image,amendment,prev_pub,last_pub,deadline_existing,deadline_new,name,'$value',cas_comment,synonyms,formula,flavor_use,prohibited_notes,restricted_photo_notes,restricted_notes,specified_notes,type,risk,contrib_others,contrib_others_notes,cat1,cat2,cat3,cat4,cat5A,cat5B,cat5C,cat5D,cat6,cat7A,cat7B,cat8,cat9,cat10A,cat10B,cat11A,cat11B,cat12 FROM IFRALibrary WHERE id = '".$r['id']."'";
+				mysqli_query($conn, $n);
+			}
+		}
+		mysqli_query($conn, "DELETE FROM IFRALibrary WHERE cas REGEXP '\n'");
+		mysqli_query($conn, "DELETE FROM IFRALibrary WHERE name = '' OR ifra_key = 'Key|String'");
+		
+}
 ?>
\ No newline at end of file
diff --git a/func/searchIFRA.php b/func/searchIFRA.php
index 7646d66d..7eb8228c 100755
--- a/func/searchIFRA.php
+++ b/func/searchIFRA.php
@@ -22,7 +22,11 @@ function searchIFRA($cas, $name, $get,  $defCatClass ){
 				if(!$res["$defCatClass"]){
 					return $res['type'].' - '.$res['risk'];
 				}else{
-					return $res["$defCatClass"].' - '.$res['risk'];
+					if ($res["$defCatClass"] === 0 || $res["$defCatClass"] === null || !is_numeric($res["$defCatClass"])) {
+						return '0'.' - '.$res['risk'];
+    				}else{
+						return $res["$defCatClass"].' - '.$res['risk'];
+					}
 				}
 			}
 		}
diff --git a/pages/IFRA.php b/pages/IFRA.php
index 80108395..27c0991c 100755
--- a/pages/IFRA.php
+++ b/pages/IFRA.php
@@ -118,7 +118,7 @@
             
             <div id="overwrite-msg">
                 <div class="dropdown-divider"></div>
-            	<div class="col-sm col-sm-10 text-xs-center alert alert-warning">
+            	<div class="col-sm col-sm-auto text-xs-center alert alert-warning">
                 	<p class="alert-link"><strong>IMPORTANT:</strong></p>
                 	<p class="alert-link">This operation will wipe out any data already in your IFRA Library, so please make sure the file you uploading is in the right format and have taken a <a href="/pages/operations.php?do=backupDB">backup</a> before.</p>
                 </div>
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index ef1987c7..9f065762 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -195,7 +195,7 @@
 		
 		  const checkUsage = (selector, regulator, limit, concentration, restriction) => {
 			if (regulator === "IFRA" && parseFloat(limit) < parseFloat(concentration)) {
-			  setAlertClassAndIcon(selector, 'alert-danger', `Max usage: ${limit}% IFRA Regulated`);
+			  setAlertClassAndIcon(selector, 'alert-danger', `Max usage: ${limit}% IFRA Regulated,  ${restriction}`);
 			} else if (regulator === "PV" && parseFloat(limit) < parseFloat(concentration)) {
 			  switch (restriction) {
 				case 1:
diff --git a/releasenotes.md b/releasenotes.md
index 227894a8..d2a53536 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,3 +1,4 @@
 Whats New in v11.0
 --------------------------
+- Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - This release may include more changes, for full details please refer to the CHANGELOG

From 153d543e60710f064af019a8657d92f28a4c28fe Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 12:07:49 +0100
Subject: [PATCH 07/44] [089fa55] - Fix a bug preventing adding new ingredients

---
 CHANGELOG.md          | 1 +
 pages/update_data.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f9ba93d..6856d94f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Fix a bug preventing adding new ingredients
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - IFRA structure images import improvements
 
diff --git a/pages/update_data.php b/pages/update_data.php
index b7d9d00d..e064012c 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -1542,7 +1542,7 @@ function formatVal($num){
 	}else{
 		$name = sanChar(mysqli_real_escape_string($conn, $_POST["name"]));
 
-		$query = "INSERT INTO ingredients (name, INCI, cas, einecs, reach, FEMA, type, strength, category, profile, notes, odor, purity, solvent, allergen, physical_state) VALUES ('$name', '$INCI', '$cas', '$einecs', '$reach', '$fema', '$type', '$strength', '$category', '$profile',  '$notes', '$odor', '$purity', '$solvent', '$allergen', '1')";
+		$query = "INSERT INTO ingredients (name, INCI, cas, einecs, reach, FEMA, type, strength, category, profile, notes, odor, purity, solvent, allergen, physical_state) VALUES ('$name', '$INCI', '$cas', '$einecs', '$reach', '$fema', '$type', '$strength', '$category', '$profile',  '$notes', '$odor', '$purity', '$solvent', '1')";
 		
 		if(mysqli_num_rows(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$name'"))){
 			$response["error"] = $name.' already exists!';

From cd4504d9be1d71323bfcb686f7d60090bddafc3c Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 12:11:21 +0100
Subject: [PATCH 08/44] [153d543] - Fix a bug preventing adding new ingredients

---
 pages/update_data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/update_data.php b/pages/update_data.php
index e064012c..18261c44 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -1542,7 +1542,7 @@ function formatVal($num){
 	}else{
 		$name = sanChar(mysqli_real_escape_string($conn, $_POST["name"]));
 
-		$query = "INSERT INTO ingredients (name, INCI, cas, einecs, reach, FEMA, type, strength, category, profile, notes, odor, purity, solvent, allergen, physical_state) VALUES ('$name', '$INCI', '$cas', '$einecs', '$reach', '$fema', '$type', '$strength', '$category', '$profile',  '$notes', '$odor', '$purity', '$solvent', '1')";
+		$query = "INSERT INTO ingredients (name, INCI, cas, einecs, reach, FEMA, type, strength, category, profile, notes, odor, purity, solvent, physical_state) VALUES ('$name', '$INCI', '$cas', '$einecs', '$reach', '$fema', '$type', '$strength', '$category', '$profile',  '$notes', '$odor', '$purity', '$solvent', '1')";
 		
 		if(mysqli_num_rows(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$name'"))){
 			$response["error"] = $name.' already exists!';

From 15778e7709bd574825b4f2cd8911a20f504e9fae Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 12:19:04 +0100
Subject: [PATCH 09/44] [cd4504d] - Treat empty IFRA Library values
 (PROHIBITION, SPECIFICATION) as 0% allowed

---
 pages/viewFormula.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 9f065762..8298708c 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -219,7 +219,7 @@
 		  checkUsage('td:eq(5)', data['usage_regulator'], data['usage_limit'], data['concentration'], data['usage_restriction']);
 		
 		  // Check ingredient classification
-		  if (data.ingredient.classification == 4) {
+		  if (data.ingredient.classification == 4 || data['usage_limit'] == 0) {
 			$(row).find('td').not('td:eq(7),td:eq(8),td:eq(9),:eq(10)').addClass('bg-banned text-light').append('<i rel="tip" title="This material is prohibited" class="mx-2 pv_point_gen fas fa-ban"></i>');
 		  }
 		

From e79315ad0ba695c924aac1f6ec4f29d18151bef2 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 16:13:32 +0100
Subject: [PATCH 10/44] [15778e7] - IFRA Library validation updates

---
 core/finished_formula_data.php | 12 ++---
 core/full_formula_data.php     | 10 +++--
 func/searchIFRA.php            | 80 +++++++++++++++++++++-------------
 func/validateFormula.php       |  3 +-
 pages/viewFormula.php          |  2 +-
 5 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/core/finished_formula_data.php b/core/finished_formula_data.php
index c403a14b..983c1b8c 100644
--- a/core/finished_formula_data.php
+++ b/core/finished_formula_data.php
@@ -126,11 +126,13 @@
 		$r['cost'] = (float)calcCosts(getPrefSupplier($ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
     } 
 
-	$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
-	
-	if(($u['0'] && $ing_q['byPassIFRA'] == 0)){
-		$r['usage_limit'] = number_format((float)$u['0']?:100, $settings['qStep']);
-		$r['usage_restriction'] = (string)$u['1'] ?: 'N/A';
+	//$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
+	$u = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass);
+
+	//if(($u['0'] && $ing_q['byPassIFRA'] == 0)){
+	if(($u['val'] || $u['type'] && $ing_q['byPassIFRA'] == 0)){	
+		$r['usage_limit'] = number_format((float)$u['val']?:100, $settings['qStep']);
+		$r['usage_restriction'] = (string)$u['risk'] ?: 'N/A';
 		$r['usage_regulator'] = (string)"IFRA";
 	}else{
 		$r['usage_limit'] = number_format((float)$ing_q["$defCatClass"], $settings['qStep']) ?: 100;
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index e6254c4e..48f1765c 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -192,11 +192,13 @@
 
 	}
 
-	$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
+	$u = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass);
+	//$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
 	
-	if(($u['0'] && $ing_q['byPassIFRA'] == 0)){
-		$r['usage_limit'] = (float)number_format((float)$u['0'], $settings['qStep']);
-		$r['usage_restriction'] = (string)$u['1'] ?: 'N/A';
+	if(($u['val'] || $u['type'] && $ing_q['byPassIFRA'] == 0)){
+		$r['usage_limit'] = (float)number_format((float)$u['val'], $settings['qStep']);
+		$r['usage_restriction'] = (string)$u['risk'] ?: 'N/A';
+		$r['usage_restriction_type'] = (string)$u['type'] ?: 'N/A';
 		$r['usage_regulator'] = (string)"IFRA";
 	}else{
 		$r['usage_limit'] = number_format((float)$ing_q["$defCatClass"], $settings['qStep']) ?: 100;
diff --git a/func/searchIFRA.php b/func/searchIFRA.php
index 7eb8228c..9ec815db 100755
--- a/func/searchIFRA.php
+++ b/func/searchIFRA.php
@@ -1,35 +1,55 @@
 <?php 
 if (!defined('pvault_panel')){ die('Not Found');}
 
-function searchIFRA($cas, $name, $get,  $defCatClass ){
-	global $conn;
-	if(empty($name)){
-		return null;
-	}
-	
-	if($cas !== '0'){//IGNORE VALUE FOR CARRIERS
-		if($cas){
-			$q = "cas = '$cas'";
-		}else{
-			$q = "name = '$name' OR synonyms LIKE '%$name%'";
-		}
-			
-		$res = mysqli_fetch_array(mysqli_query($conn, "SELECT risk, $defCatClass, type, formula FROM IFRALibrary WHERE $q"));
-		if($get){
-			return $res[$get];
-		}else{		
-			if($res){
-				if(!$res["$defCatClass"]){
-					return $res['type'].' - '.$res['risk'];
-				}else{
-					if ($res["$defCatClass"] === 0 || $res["$defCatClass"] === null || !is_numeric($res["$defCatClass"])) {
-						return '0'.' - '.$res['risk'];
-    				}else{
-						return $res["$defCatClass"].' - '.$res['risk'];
-					}
-				}
-			}
-		}
-	}
+function searchIFRA($cas, $name, $get, $defCatClass) {
+    global $conn;
+    
+    if (empty($name)) {
+        return null;
+    }
+    
+    // Build the query conditionally based on $cas value
+    if ($cas !== '0') { // IGNORE VALUE FOR CARRIERS
+        if ($cas) {
+            $q = "cas = '$cas'";
+        } else {
+            $q = "name = '$name' OR synonyms LIKE '%$name%'";
+        }
+        
+        $query = "SELECT risk, $defCatClass, type, formula FROM IFRALibrary WHERE $q";
+        $result = mysqli_query($conn, $query);
+        $res = mysqli_fetch_array($result, MYSQLI_ASSOC);
+
+        if ($get) {
+            return $res[$get] ?? null;  // Return the specific column requested, or null if not found
+        } else {
+            if ($res) {
+                if (empty($res[$defCatClass])) {
+                    return array(
+                        'type' => $res['type'],
+                        'risk' => $res['risk'],
+                        'val' => null // val is null if $defCatClass is empty
+                    );
+                } else {
+                    if (in_array($res['type'], ['PROHIBITION', 'SPECIFICATION'])) {
+                        return array(
+                            'risk' => $res['risk'],
+                            'type' => $res['type'],
+                            'val' => 0
+                        );
+                    } else {
+                        return array(
+                            'risk' => $res['risk'],
+                            'type' => $res['type'],
+                            'val' => $res[$defCatClass]
+                        );
+                    }
+                }
+            }
+        }
+    }
+    
+    return null; // Fallback if no conditions are met
 }
+
 ?>
diff --git a/func/validateFormula.php b/func/validateFormula.php
index 0e603071..18ed4c40 100644
--- a/func/validateFormula.php
+++ b/func/validateFormula.php
@@ -25,7 +25,8 @@ function validateFormula($fid, $bottle, $new_conc, $mg, $defCatClass, $qStep) {
         $ing = mysqli_fetch_array($ingredient_query);
         $cas = $ing['cas'];
         $limitIFRA = searchIFRA($cas, $ingredient_name, null, $defCatClass);
-        $limit = explode(' - ', $limitIFRA)[0];
+        //$limit = explode(' - ', $limitIFRA)[0];
+		$limit = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass)['val'];
 
         // Calculate new quantity and concentration
         $new_quantity = $formula['quantity'] / $mg * $new_conc;
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 8298708c..7238acc2 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -219,7 +219,7 @@
 		  checkUsage('td:eq(5)', data['usage_regulator'], data['usage_limit'], data['concentration'], data['usage_restriction']);
 		
 		  // Check ingredient classification
-		  if (data.ingredient.classification == 4 || data['usage_limit'] == 0) {
+		  if (data.ingredient.classification == 4 || data['usage_restriction_type'] == 'PROHIBITION') {
 			$(row).find('td').not('td:eq(7),td:eq(8),td:eq(9),:eq(10)').addClass('bg-banned text-light').append('<i rel="tip" title="This material is prohibited" class="mx-2 pv_point_gen fas fa-ban"></i>');
 		  }
 		

From 0d6f4fb5b345d28e3741cc8e9f9ec9bbdec7b8be Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Mon, 12 Aug 2024 18:04:21 +0100
Subject: [PATCH 11/44] [e79315a] - IFRA Library validation updates

---
 modules/suppliers/local.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/suppliers/local.php b/modules/suppliers/local.php
index 5475f576..47475d39 100644
--- a/modules/suppliers/local.php
+++ b/modules/suppliers/local.php
@@ -95,10 +95,11 @@
 	$r['category']['name'] = (string)$cat['name']?: 'N/A';
 	$r['category']['image'] = (string)$cat['image']?: '/img/pv_molecule.png';
 
+
 	if(($limit = searchIFRA($ingredient['cas'],$ingredient['name'],null,$defCatClass)) && $ingredient['byPassIFRA'] == 0){
-		$limit = explode(' - ', $limit);		
-		$r['usage']['limit'] = (float)$limit['0'];
-		$r['usage']['reason'] = (string)$limit['1'];
+		//$limit = explode(' - ', $limit);		
+		$r['usage']['limit'] = (float)$limit['val'];
+		$r['usage']['reason'] = (string)$limit['risk'];
 	}else{
 		$r['usage']['limit'] = number_format((float)$ingredient["$defCatClass"], $settings['qStep']) ?: 100;
 		$r['usage']['reason'] = (int)$ingredient['usage_type'];

From de321b8bf5cf137dee5429ebcb453955fc7733ec Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Tue, 13 Aug 2024 08:27:15 +0100
Subject: [PATCH 12/44] [0d6f4fb] - IFRA Library validation updates

---
 core/full_formula_data.php            | 15 ++++++++++++++-
 func/validateFormula.php              | 18 +++++++++++-------
 pages/viewFormula.php                 |  9 ++++++---
 pages/views/ingredients/usageData.php | 20 +++++++++++++-------
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index 48f1765c..ebaf570d 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -121,6 +121,7 @@
 foreach ($form as $formula){
 	
 	$ing_q = mysqli_fetch_array(mysqli_query($conn, "SELECT id, name, cas, $defCatClass, profile, odor, category, physical_state,usage_type AS classification, type, byPassIFRA FROM ingredients WHERE name = '".$formula['ingredient']."'"));
+	/*
 	$reps = mysqli_query($conn,"SELECT ing_rep_name FROM ingReplacements WHERE ing_name = '".$formula['ingredient']."'");
 	if (mysqli_num_rows($reps)==0) { 
 		$reps = mysqli_query($conn,"SELECT ing_name FROM ingReplacements WHERE ing_rep_name = '".$formula['ingredient']."'");
@@ -128,7 +129,7 @@
 	while($replacements = mysqli_fetch_array($reps)){
 		$replacement[] = $replacements;
 	}
-	
+	*/
 	$totalcontainsOthers = mysqli_num_rows(mysqli_query($conn, "SELECT name,$defPercentage,cas FROM ingredient_compounds WHERE ing = '".$formula['ingredient']."'"));
 	
 	
@@ -203,6 +204,18 @@
 	}else{
 		$r['usage_limit'] = number_format((float)$ing_q["$defCatClass"], $settings['qStep']) ?: 100;
 		$r['usage_restriction'] = (int)$ing_q['classification'];
+		
+		if ($ing_q['classification'] == 1) {
+			$r['usage_restriction_type'] = 'RECOMMENDATION';
+		} elseif ($ing_q['classification'] == 2) {
+			$r['usage_restriction_type'] = 'RESTRICTION';
+		} elseif ($ing_q['classification'] == 3) {
+			$r['usage_restriction_type'] = 'SPECIFICATION';
+		} elseif ($ing_q['classification'] == 4) {
+			$r['usage_restriction_type'] = 'PROHIBITION';
+		} else {
+			$r['usage_restriction_type'] = 'RECOMMENDATION';
+		}
 		$r['usage_regulator'] = (string)"PV";
 		$r['ingredient']['classification'] = (int)$ing_q['classification'] ?: 1;
 	}
diff --git a/func/validateFormula.php b/func/validateFormula.php
index 18ed4c40..c9e679cc 100644
--- a/func/validateFormula.php
+++ b/func/validateFormula.php
@@ -24,23 +24,27 @@ function validateFormula($fid, $bottle, $new_conc, $mg, $defCatClass, $qStep) {
 
         $ing = mysqli_fetch_array($ingredient_query);
         $cas = $ing['cas'];
-        $limitIFRA = searchIFRA($cas, $ingredient_name, null, $defCatClass);
-        //$limit = explode(' - ', $limitIFRA)[0];
-		$limit = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass)['val'];
-
+		$limitIFRA = searchIFRA($cas,$ingredient_name,null,$defCatClass);
+		$limit = $limitIFRA['val'];
+		$type = $limitIFRA['type'];
+		
+		
         // Calculate new quantity and concentration
         $new_quantity = $formula['quantity'] / $mg * $new_conc;
         $conc = ($new_quantity / $bottle) * 100;
         $conc_p = number_format(($formula['concentration'] / 100) * $conc, $qStep);
 
-        if ($limit ) {
+        if ($limit) {
             if ($limit < $conc_p) {
-                $errors[] = "Ingredient $ingredient_name exceeds IFRA limit $limit%";
+                $errors[] = "$ingredient_name exceeds IFRA limit $limit% - $type";
+				if($type === "PROHIBITION"){
+					$errors[] = "$type is PROHIBITED";
+				}
             }
         } else {
             if ($ing[$defCatClass] !== null) {
                 if ($ing[$defCatClass] < $conc_p) {
-                    $errors[] = "Ingredient $ingredient_name exceeds local DB limit%";
+                    $errors[] = "$ingredient_name exceeds local DB limit $ing[$defCatClass]%";
                 }
             } else {
                 $errors[] = "No limit record found for ingredient $ingredient_name";
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 7238acc2..8c7a30b6 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -199,14 +199,17 @@
 			} else if (regulator === "PV" && parseFloat(limit) < parseFloat(concentration)) {
 			  switch (restriction) {
 				case 1:
-				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}% PV Regulated`);
 				  break;
 				case 2:
-				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}% PV Regulated`);
 				  break;
 				case 3:
-				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}% PV Regulated`);
 				  break;
+				case 4:
+				  setAlertClassAndIcon(selector, 'alert-warning', `Prohibited or Banned - PV Regulated`);
+				  break;  
 				default:
 				  setAlertClassAndIcon(selector, 'alert-success', '');
 			  }
diff --git a/pages/views/ingredients/usageData.php b/pages/views/ingredients/usageData.php
index da27a556..f040f805 100644
--- a/pages/views/ingredients/usageData.php
+++ b/pages/views/ingredients/usageData.php
@@ -23,11 +23,14 @@
 
 $ing = mysqli_fetch_array(mysqli_query($conn, "SELECT id, cas,name,usage_type,noUsageLimit,byPassIFRA,flavor_use,allergen,cat1,cat2,cat3,cat4,cat5A,cat5B,cat5C,cat5D,cat6,cat7A,cat7B,cat8,cat9,cat10A,cat10B,cat11A,cat11B,cat12 FROM ingredients WHERE id = '".$_POST['ingID']."'"));
 
-$rType = searchIFRA($ing['cas'],$ing['name'],'type', $defCatClass);
-$limit = searchIFRA($ing['cas'],$ing['name'],null, 'cat'.$cats[$counter]['name']);
+//$rType = searchIFRA($ing['cas'],$ing['name'],'type', $defCatClass);
+//$limit = searchIFRA($ing['cas'],$ing['name'],null, 'cat'.$cats[$counter]['name']);
+/*
 if($reason = searchIFRA($ing['cas'],$ing['name'],null,$defCatClass)){
 	$reason = explode(' - ',$reason);
 }
+*/
+$reason = searchIFRA($ing['cas'],$ing['name'],null,$defCatClass);
 
 if($usageLimit = searchIFRA($ing['cas'],$ing['name'],null,$defCatClass)){ 
 	$noLimit = 'disabled'; 
@@ -81,7 +84,7 @@
             Usage classification
         </div>
         <div class="col-sm-4">
-            <div id="class_bypass"><?php echo $rType.' - '.$reason['1']; ?></div>
+            <div id="class_bypass"><?php echo $reason['type'].' - '.$reason['risk']; ?></div>
             <div id="usage_type_bypass">
                 <select name="usage_type" id="usage_type" class="form-select">
                     <option value="1" <?php if($ing['usage_type'] == "1") echo 'selected'; ?>>Recommendation</option>
@@ -97,7 +100,7 @@
 <div class="container-fluid">
     <table class="table">
         <?php for($i = 0; $i < $rows / $cols; $i++) { ?>
-            <tr <?php if($rType){ ?>class="<?php echo $usageStyle[$i % 2]; ?>" <?php }?>>
+            <tr <?php if($reason['type']){ ?>class="<?php echo $usageStyle[$i % 2]; ?>" <?php }?>>
                 <?php for($j = 0; $j < $cols && $counter <= $rows; $j++, $counter++) { ?>
                     <td align="center">
                         <a href="#" rel="tip" title="<?php echo $cats[$counter]['description']; ?>">Cat<?php echo $cats[$counter]['name']; ?> %:</a>
@@ -105,9 +108,9 @@
                     <td>
                         <?php
                         if($ing['byPassIFRA'] == 0 && $limit = searchIFRA($ing['cas'], $ing['name'], null, 'cat'.$cats[$counter]['name'])){
-                            $limit = explode(' - ', $limit);
+                           // $limit = explode(' - ', $limit);
                         ?>
-                            <input name="cat<?php echo $cats[$counter]['name']; ?>" type="text" class="form-control" id="cat<?php echo $cats[$counter]['name']; ?>" disabled value="<?php echo number_format((float)$limit[0], 4); ?>" />
+                            <input name="cat<?php echo $cats[$counter]['name']; ?>" type="text" class="form-control" id="cat<?php echo $cats[$counter]['name']; ?>" disabled value="<?php echo number_format((float)$limit['val'], 4); ?>" />
                         <?php } else { ?>
                             <input name="cat<?php echo $cats[$counter]['name']; ?>" type="text" class="form-control" id="cat<?php echo $cats[$counter]['name']; ?>" value="<?php echo number_format($ing['cat'.$cats[$counter]['name']], 4); ?>" />
                         <?php } ?>
@@ -158,7 +161,10 @@ function byPassCheck(s){
 		byPassCheck(true);
 	}else if (byPassIFRA === 0){
 		byPassCheck(false);
-		
+	}  
+	  
+	if ($('#usage_type').val() === "4") {
+		$("input[id^='cat']").prop('disabled', true).val('0.0000');
 	}
 	
 	if(disLimits === 1){

From 2248216a303c2869014d51fc5a070dde818aa24e Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Tue, 13 Aug 2024 09:55:54 +0100
Subject: [PATCH 13/44] [de321b8] - Added editability in IFRA Library

---
 CHANGELOG.md          |   1 +
 pages/IFRA.php        | 110 +++++++++++++++++++++++++++++-------------
 pages/update_data.php |   6 +--
 pages/viewFormula.php |  10 ++--
 releasenotes.md       |   1 +
 5 files changed, 87 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6856d94f..e673444c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Added editability in IFRA Library
 - Fix a bug preventing adding new ingredients
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - IFRA structure images import improvements
diff --git a/pages/IFRA.php b/pages/IFRA.php
index 27c0991c..127c5a73 100755
--- a/pages/IFRA.php
+++ b/pages/IFRA.php
@@ -254,23 +254,23 @@
 			{ data : 'type', title: 'IFRA Type' },
 			{ data : 'deadline_existing', title: 'Implementation deadline for existing creations' },
 			{ data : 'deadline_new', title: 'Implementation deadline for new creations' },
-			{ data : 'cat1', title: 'Cat1%' },
-			{ data : 'cat2', title: 'Cat2%' },
-			{ data : 'cat3', title: 'Cat3%' },
-			{ data : 'cat4', title: 'Cat4%' },
-			{ data : 'cat5A', title: 'Cat5A%' },
-			{ data : 'cat5B', title: 'Cat5B%' },
-			{ data : 'cat5C', title: 'Cat5C%' },
-			{ data : 'cat5D', title: 'Cat5D%' },
-			{ data : 'cat6', title: 'Cat6%' },
-			{ data : 'cat7A', title: 'Cat7A%' },
-			{ data : 'cat7B', title: 'Cat7B%' },
-			{ data : 'cat8', title: 'Cat8%' },
-			{ data : 'cat9', title: 'Cat9%' },
-			{ data : 'cat10A', title: 'Cat10A%' },
-			{ data : 'cat11A', title: 'Cat11A%' },
-			{ data : 'cat11B', title: 'Cat11B%' },
-			{ data : 'cat12', title: 'Cat12%' },
+			{ data: 'cat1', title: 'Cat1%', render: (data, type, row) => renderCategory(data, row, 'cat1') },
+			{ data: 'cat2', title: 'Cat2%', render: (data, type, row) => renderCategory(data, row, 'cat2') },
+			{ data: 'cat3', title: 'Cat3%', render: (data, type, row) => renderCategory(data, row, 'cat3') },
+			{ data: 'cat4', title: 'Cat4%', render: (data, type, row) => renderCategory(data, row, 'cat4') },
+			{ data: 'cat5A', title: 'Cat5A%', render: (data, type, row) => renderCategory(data, row, 'cat5A') },
+			{ data: 'cat5B', title: 'Cat5B%', render: (data, type, row) => renderCategory(data, row, 'cat5B') },
+			{ data: 'cat5C', title: 'Cat5C%', render: (data, type, row) => renderCategory(data, row, 'cat5C') },
+			{ data: 'cat5D', title: 'Cat5D%', render: (data, type, row) => renderCategory(data, row, 'cat5D') },
+			{ data: 'cat6', title: 'Cat6%', render: (data, type, row) => renderCategory(data, row, 'cat6') },
+			{ data: 'cat7A', title: 'Cat7A%', render: (data, type, row) => renderCategory(data, row, 'cat7A') },
+			{ data: 'cat7B', title: 'Cat7B%', render: (data, type, row) => renderCategory(data, row, 'cat7B') },
+			{ data: 'cat8', title: 'Cat8%', render: (data, type, row) => renderCategory(data, row, 'cat8') },
+			{ data: 'cat9', title: 'Cat9%', render: (data, type, row) => renderCategory(data, row, 'cat9') },
+			{ data: 'cat10A', title: 'Cat10A%', render: (data, type, row) => renderCategory(data, row, 'cat10A') },
+			{ data: 'cat11A', title: 'Cat11A%', render: (data, type, row) => renderCategory(data, row, 'cat11A') },
+			{ data: 'cat11B', title: 'Cat11B%', render: (data, type, row) => renderCategory(data, row, 'cat11B') },
+			{ data: 'cat12', title: 'Cat12%', render: (data, type, row) => renderCategory(data, row, 'cat12') },
 			{ data : null, title: '', render: actions }
 		],
 		order: [[ 1, 'asc' ]],
@@ -347,6 +347,10 @@ function CAS(data, type, row){
 		return data;
 	};
 	
+	function renderCategory(data, row, category){
+    	return '<a href="#" data-name="' + category + '" class="' + category + '" data-type="text" data-pk="' + row.id + '">' + data + '</a>';
+	};
+	
 	function image(data, type, row){
 		return '<img src="data:image/png;base64, '+row.image+'" class="img_ifra"/>';
 	};
@@ -504,26 +508,66 @@ className : "btn-secondary",
 	});
 	
 	$('#tdDataIFRA').editable({
-	  container: 'body',
-	  selector: 'a.cas',
-	  url: "/pages/update_data.php?IFRA=edit&type=CAS",
-	  title: 'CAS#',
-	  ajaxOptions: { 
-		dataType: 'json'
-	  },
-	  success: function(response, newValue) {
-		if(response.error){
-			return response.error; 
-		}else{ 
-			reload_data();
-		}
-	  },
-	  validate: function(value){
-		  	if($.trim(value) == ''){
+		container: 'body',
+	  	selector: 'a.cas',
+	  	url: "/pages/update_data.php?IFRA=edit&type=cas",
+	  	title: 'CAS#',
+	  	ajaxOptions: { 
+			dataType: 'json'
+	  	},
+	  	success: function(response, newValue) {
+			if(response.error){
+				return response.error; 
+			}else{ 
+				reload_data();
+			}
+	  	},
+	  	validate: function(value){
+			if($.trim(value) == ''){
 				return 'This field is required';
 			}
 	  	}
 	});
+	
+	$('#tdDataIFRA').editable({
+		container: 'body',
+		selector: 'a.cat1, a.cat2, a.cat3, a.cat4, a.cat5A, a.cat5B, a.cat5C, a.cat5D, a.cat6, a.cat7A, a.cat7B, a.cat8, a.cat9, a.cat10A, a.cat11A, a.cat11B, a.cat12',
+		type: 'POST',
+		url: "/pages/update_data.php",
+		
+		params: function(params) {
+        	var category = String($(params).attr('name').split(' ')[0]).toUpperCase();
+	        return {
+    	        IFRA: 'edit',
+        	    type: category,
+            	value: parseFloat(params.value),
+				pk: params.pk
+        	};
+    	},
+		title: function(params) {
+			var category = $(params).attr('data-name').split(' ')[0];
+			return category.toUpperCase() + '%';
+		},
+		ajaxOptions: { 
+			dataType: 'json'
+		},
+		success: function(response, newValue) {
+			if (response.error) {
+				return response.error; 
+			} else { 
+				reload_data();
+			}
+		},
+		validate: function(value) {
+			if ($.trim(value) === '') {
+				return 'This field is required';
+			}
+			if (!/^\d+(\.\d+)?$/.test(value)) {
+				return 'Please enter a valid number (e.g., 1.23)';
+			}
+		}
+	});
+
 
 });
 </script>
diff --git a/pages/update_data.php b/pages/update_data.php
index 18261c44..6ca39ba3 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -174,9 +174,9 @@
 
 
 //UPDATE CAS IFRA ENTRY
-if($_GET['IFRA'] == 'edit' && $_POST['value'] && $_GET['type'] == 'CAS'){
-	
-	if(mysqli_query($conn, "UPDATE IFRALibrary SET cas = '".$_POST['value']."' WHERE id = '".$_POST['pk']."'")){
+if($_REQUEST['IFRA'] == 'edit'){
+	$type = $_REQUEST['type'];
+	if(mysqli_query($conn, "UPDATE IFRALibrary SET $type = '".$_REQUEST['value']."' WHERE id = '".$_REQUEST['pk']."'")){
 		$response["success"] = 'IFRA entry updated';
 	}else{
 		$response["error"] = 'Something went wrong '.mysqli_error($conn);
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 8c7a30b6..267339b9 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -195,20 +195,20 @@
 		
 		  const checkUsage = (selector, regulator, limit, concentration, restriction) => {
 			if (regulator === "IFRA" && parseFloat(limit) < parseFloat(concentration)) {
-			  setAlertClassAndIcon(selector, 'alert-danger', `Max usage: ${limit}% IFRA Regulated,  ${restriction}`);
+			  setAlertClassAndIcon(selector, 'alert-danger', `Max usage: ${limit}% <p>IFRA Regulated</p> ${restriction}`);
 			} else if (regulator === "PV" && parseFloat(limit) < parseFloat(concentration)) {
 			  switch (restriction) {
 				case 1:
-				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}% PV Regulated`);
+				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}% <p>PV Regulated</p>`);
 				  break;
 				case 2:
-				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}% PV Regulated`);
+				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}% <p>PV Regulated</p>`);
 				  break;
 				case 3:
-				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}% PV Regulated`);
+				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}% <p>PV Regulated</p>`);
 				  break;
 				case 4:
-				  setAlertClassAndIcon(selector, 'alert-warning', `Prohibited or Banned - PV Regulated`);
+				  setAlertClassAndIcon(selector, 'alert-warning', `Prohibited or Banned - <p>PV Regulated</p>`);
 				  break;  
 				default:
 				  setAlertClassAndIcon(selector, 'alert-success', '');
diff --git a/releasenotes.md b/releasenotes.md
index d2a53536..c5886c7e 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,4 +1,5 @@
 Whats New in v11.0
 --------------------------
+- Added editability in IFRA Library
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - This release may include more changes, for full details please refer to the CHANGELOG

From 4e9ed56081fd106efaf391278aa127dc313efdbf Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Tue, 13 Aug 2024 09:58:44 +0100
Subject: [PATCH 14/44] [2248216] - Make sure category values returns numeric
 values only

---
 core/list_IFRA_data.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/list_IFRA_data.php b/core/list_IFRA_data.php
index 0cea9ce2..d65a3825 100644
--- a/core/list_IFRA_data.php
+++ b/core/list_IFRA_data.php
@@ -47,24 +47,24 @@
 	$r['risk'] = (string)$IFRA['risk']?:'N/A';
 	$r['contrib_others'] = (string)$IFRA['contrib_others']?:'N/A';
 	$r['contrib_others_notes'] = (string)$IFRA['contrib_others_notes']?:'N/A';
-	$r['cat1'] = (float)$IFRA['cat1']?:'N/A';
-	$r['cat2'] = (float)$IFRA['cat2']?:'N/A';
-	$r['cat3'] = (float)$IFRA['cat3']?:'N/A';
-	$r['cat4'] = (float)$IFRA['cat4']?:'N/A';
-	$r['cat5A'] = (float)$IFRA['cat5A']?:'N/A';
-	$r['cat5B'] = (float)$IFRA['cat5B']?:'N/A';
-	$r['cat5C'] = (float)$IFRA['cat5C']?:'N/A';
-	$r['cat5D'] = (float)$IFRA['cat5D']?:'N/A';
-	$r['cat6'] = (float)$IFRA['cat6']?:'N/A';
-	$r['cat7A'] = (float)$IFRA['cat7A']?:'N/A';
-	$r['cat7B'] = (float)$IFRA['cat7B']?:'N/A';
-	$r['cat8'] = (float)$IFRA['cat8']?:'N/A';
-	$r['cat9'] = (float)$IFRA['cat9']?:'N/A';
-	$r['cat10A'] = (float)$IFRA['cat10A']?:'N/A';
-	$r['cat10B'] = (float)$IFRA['cat10B']?:'N/A';
-	$r['cat11A'] = (float)$IFRA['cat11A']?:'N/A';
-	$r['cat11B'] = (float)$IFRA['cat11B']?:'N/A';
-	$r['cat12'] = (float)$IFRA['cat12']?:'N/A';
+	$r['cat1'] = (float)$IFRA['cat1'];
+	$r['cat2'] = (float)$IFRA['cat2'];
+	$r['cat3'] = (float)$IFRA['cat3'];
+	$r['cat4'] = (float)$IFRA['cat4'];
+	$r['cat5A'] = (float)$IFRA['cat5A'];
+	$r['cat5B'] = (float)$IFRA['cat5B'];
+	$r['cat5C'] = (float)$IFRA['cat5C'];
+	$r['cat5D'] = (float)$IFRA['cat5D'];
+	$r['cat6'] = (float)$IFRA['cat6'];
+	$r['cat7A'] = (float)$IFRA['cat7A'];
+	$r['cat7B'] = (float)$IFRA['cat7B'];
+	$r['cat8'] = (float)$IFRA['cat8'];
+	$r['cat9'] = (float)$IFRA['cat9'];
+	$r['cat10A'] = (float)$IFRA['cat10A'];
+	$r['cat10B'] = (float)$IFRA['cat10B'];
+	$r['cat11A'] = (float)$IFRA['cat11A'];
+	$r['cat11B'] = (float)$IFRA['cat11B'];
+	$r['cat12'] = (float)$IFRA['cat12'];
 
 	$r['defCat']['class'] = (string)$defCatClass?:'N/A';
 	$r['defCat']['limit'] = (float)$IFRA[$defCatClass]?:'0';

From c138329fb84a3aab9c89bed667affbb6a9b1cbcd Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Tue, 13 Aug 2024 10:17:21 +0100
Subject: [PATCH 15/44] [4e9ed56] - IFRA Library validation updates

---
 core/finished_formula_data.php          | 12 ++++++++++++
 pages/views/formula/finishedProduct.php | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/core/finished_formula_data.php b/core/finished_formula_data.php
index 983c1b8c..01352ad7 100644
--- a/core/finished_formula_data.php
+++ b/core/finished_formula_data.php
@@ -133,10 +133,22 @@
 	if(($u['val'] || $u['type'] && $ing_q['byPassIFRA'] == 0)){	
 		$r['usage_limit'] = number_format((float)$u['val']?:100, $settings['qStep']);
 		$r['usage_restriction'] = (string)$u['risk'] ?: 'N/A';
+		$r['usage_restriction_type'] = (string)$u['type'] ?: 'N/A';
 		$r['usage_regulator'] = (string)"IFRA";
 	}else{
 		$r['usage_limit'] = number_format((float)$ing_q["$defCatClass"], $settings['qStep']) ?: 100;
 		$r['usage_restriction'] = (int)$ing_q['classification'];
+		if ($ing_q['classification'] == 1) {
+			$r['usage_restriction_type'] = 'RECOMMENDATION';
+		} elseif ($ing_q['classification'] == 2) {
+			$r['usage_restriction_type'] = 'RESTRICTION';
+		} elseif ($ing_q['classification'] == 3) {
+			$r['usage_restriction_type'] = 'SPECIFICATION';
+		} elseif ($ing_q['classification'] == 4) {
+			$r['usage_restriction_type'] = 'PROHIBITION';
+		} else {
+			$r['usage_restriction_type'] = 'RECOMMENDATION';
+		}
 		$r['usage_regulator'] = (string)"PV";
 		$r['ingredient']['classification'] = (int)$ing_q['classification'] ?: 1;
 	}
diff --git a/pages/views/formula/finishedProduct.php b/pages/views/formula/finishedProduct.php
index fa52cf31..4bc0e7ea 100644
--- a/pages/views/formula/finishedProduct.php
+++ b/pages/views/formula/finishedProduct.php
@@ -314,14 +314,17 @@
 			} else if (regulator === "PV" && parseFloat(limit) < parseFloat(concentration)) {
 			  switch (restriction) {
 				case 1:
-				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}% <p>PV Regulated</p>`);
 				  break;
 				case 2:
-				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}% <p>PV Regulated</p>`);
 				  break;
 				case 3:
-				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}%`);
+				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}% <p>PV Regulated</p>`);
 				  break;
+				case 4:
+				  setAlertClassAndIcon(selector, 'alert-warning', `Prohibited or Banned - <p>PV Regulated</p>`);
+				  break; 
 				default:
 				  setAlertClassAndIcon(selector, 'alert-success', '');
 			  }
@@ -334,7 +337,7 @@
 		  checkUsage('td:eq(3)', data['usage_regulator'], data['usage_limit'], data['concentration'], data['usage_restriction']);
 		
 		  // Check ingredient classification
-		  if (data.ingredient.classification == 4) {
+		  if (data.ingredient.classification == 4 || data['usage_restriction_type'] == 'PROHIBITION') {
 			$(row).find('td').not('td:eq(5)').addClass('bg-banned text-light').append('<i rel="tip" title="This material is prohibited" class="mx-2 pv_point_gen fas fa-ban"></i>');
 		  }
 		

From 2ec5fb0e58a6fd2f04e2caada679c3d2cfee3ddb Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Wed, 21 Aug 2024 15:21:08 +0100
Subject: [PATCH 16/44] [c138329] - Return error if backend fails when adding
 an ingredient

---
 pages/mgmIngredient.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/mgmIngredient.php b/pages/mgmIngredient.php
index abd001c7..e1f0409c 100755
--- a/pages/mgmIngredient.php
+++ b/pages/mgmIngredient.php
@@ -415,6 +415,11 @@
 			    <?php if($ing['id']){ ?>
 				reload_overview();
 				<?php } ?>
+			},
+			error: function (xhr, status, error) {
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				$('.toast').toast('show');
 			}
 		});
 	});

From 01a0b1ef46a552aee1a772dc592be60e2064713e Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 08:42:19 +0100
Subject: [PATCH 17/44] - Added more error handling for ajax requests - Added a
 var (pvSearch) to search ingredients in the local datatabase - Changed the
 way the ingredient is handled when exists in a formula but not in the
 database. Instead of auto creating it when clicked, it presents options to
 create it, search in PV Online or import via JSON

---
 CHANGELOG.md                           |   3 +
 core/full_formula_data.php             |  11 +-
 func/checkIng.php                      |  12 +-
 js/mgmIngredient.js                    |   9 +-
 modules/suppliers/local.php            |   2 +-
 pages/formula.php                      |   4 +-
 pages/listIngredients.php              | 764 ++++++++++++-------------
 pages/mgmIngredient.php                | 100 +---
 pages/viewFormula.php                  |  54 ++
 pages/views/ingredients/mgmGeneral.php |  42 +-
 releasenotes.md                        |   1 +
 11 files changed, 489 insertions(+), 513 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e673444c..12d38108 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 ### Version 11.0
+- Added more error handling for ajax requests
+- Added a var (pvSearch) to search ingredients in the local datatabase
+- Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON
 - Added editability in IFRA Library
 - Fix a bug preventing adding new ingredients
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index ebaf570d..a3f9eafd 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -232,7 +232,6 @@
    	$r['ingredient']['name'] = (string)$ingName ?: $formula['ingredient'];
 	$r['ingredient']['cas'] = (string)$ing_q['cas'] ?: 'N/A';
 	$r['ingredient']['physical_state'] = (int)$ing_q['physical_state'];
-	//$r['ingredient']['classification'] = (int)$ing_q['classification'] ?: 1;
 	$r['ingredient']['type'] = (string)$ing_q['type'] ?: 'Unknown';
 
 	$r['ingredient']['desc'] = (string)$desc ?: '-';
@@ -244,17 +243,11 @@
 	$r['ingredient']['inventory']['batch'] = (string)$inventory['batch'] ?: 'N/A';
 	$r['ingredient']['inventory']['purchased'] = (string)$inventory['purchased'] ?: 'N/A';
 	
-	//$totalReplacements = 0;
-	//foreach ($replacement as $rp){
-	//	$totalReplacements++;
-	//	$r['ingredient'][]['replacement']['name'] = (string)$rp['ing_rep_name'] ?: (string)$rp['ing_name'] ?: 'N/A';
-	//}
-	//$r['ingredient']['replacement']['total'] = $totalReplacements ?: 0;
-	
 	
 	$r['ingredient']['containsOthers']['total'] = $totalcontainsOthers ?: 0;
 	
-	$r['chk_ingredient'] = (string)checkIng($formula['ingredient'],$defCatClass,$conn) ?: null;
+	$r['chk_ingredient'] = (string)checkIng($formula['ingredient'],$defCatClass,$conn)['text'];
+	$r['chk_ingredient_code'] = (int)checkIng($formula['ingredient'],$defCatClass,$conn)['code'];
 	$r['exclude_from_calculation'] = (int)$formula['exclude_from_calculation'] ?: 0;
 	
 	
diff --git a/func/checkIng.php b/func/checkIng.php
index 5b1b6592..45542c10 100755
--- a/func/checkIng.php
+++ b/func/checkIng.php
@@ -1,5 +1,5 @@
-<?php if (!defined('pvault_panel')){ die('Not Found');}?>
 <?php
+
 function checkIng($ingredient, $defCatClass, $conn){
 	$chk = mysqli_query($conn, "SELECT id, name, $defCatClass, profile, cas FROM ingredients WHERE name = '$ingredient' OR chemical_name = '$ingredient'");	
 	if(mysqli_num_rows($chk)){
@@ -11,17 +11,17 @@ function checkIng($ingredient, $defCatClass, $conn){
 			$chkPrice = mysqli_fetch_array(mysqli_query($conn, "SELECT price FROM suppliers WHERE ingID = '".$qValues['id']."'"));
 			
 			if(empty($chkIFRA[$defCatClass]) && !isset($qValues[$defCatClass])){
-				return 'Missing usage data';
+				return ['text' => 'Missing usage data', 'code' => 1];
 			}
 			if(empty($chkPrice['price'])){
-				return 'Missing pricing data';
+				return ['text' => 'Missing pricing data', 'code' => 2];
 			}
 			if(!($qValues['profile'])){
-				return 'Missing profile data';
+				return ['text' => 'Missing profile data', 'code' => 3];
 			}
 		}
 	}else{
-		return 'Ingredient is missing from the database';
+        return ['text' => 'Ingredient is missing from the database', 'code' => 4];
 	}
 }
-?>
+
diff --git a/js/mgmIngredient.js b/js/mgmIngredient.js
index e03c31c4..14a55af4 100644
--- a/js/mgmIngredient.js
+++ b/js/mgmIngredient.js
@@ -7,7 +7,9 @@ function fetch_generalData(){
 		url: '/pages/views/ingredients/mgmGeneral.php', 
 		type: 'GET',
 		data: {
-			id: btoa(myIngName)
+			id: btoa(myIngName),
+			newIngName: newIngName,
+			newIngCAS: newIngCAS
 		},
 		dataType: 'html',
 		success: function (data) {
@@ -224,9 +226,12 @@ $('#genDOC').on('click', '[id*=generateDOC]', function () {
 			if(data.success){
 				msg = '<div class="alert alert-success">' + data.success + '</div>';
 			}else if(data.error){
-				msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+				msg = '<div class="alert alert-danger">' + data.error + '</div>';
 			}
 			$('#doc_res').html(msg);
+		},
+		error: function (xhr, status, error) {
+			$('#doc_res').html('<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error + '</div>');
 		}
 	});
 });
diff --git a/modules/suppliers/local.php b/modules/suppliers/local.php
index 47475d39..4d8b59ff 100644
--- a/modules/suppliers/local.php
+++ b/modules/suppliers/local.php
@@ -61,7 +61,7 @@
 
 $extra = "ORDER BY ".$order_by." ".$order;
 
-$s = trim(mysqli_real_escape_string($conn,$_POST['search']['value']));
+$s = trim(mysqli_real_escape_string($conn,$_POST['search']['value'] ?: $_POST['pvSearch']));
 
 if($s != ''){
    $t = '';
diff --git a/pages/formula.php b/pages/formula.php
index a156c0f8..1e75accc 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -70,7 +70,7 @@
                     </h2>
                     <h5 class="m-1 text-primary">
                       <span>
-                        <a href="#" rel="tip" class="text-secondary-emphasis"" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
+                        <a href="#" rel="tip" class="text-secondary-emphasis" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
                           <?= ucfirst($meta['catClass']) ?>
                         </a>
                       </span>
@@ -251,7 +251,7 @@
 <script>
 document.title = "<?=$meta['name'].' - '.$product?>";
 var myFID = "<?=$fid?>";
-var isProtected = "<?=$meta['isProtected']?>"
+var isProtected = "<?=$meta['isProtected']?>";
 
 $('#formula_name').click(function() {
     reload_formula_data();
diff --git a/pages/listIngredients.php b/pages/listIngredients.php
index de702324..407ec66e 100644
--- a/pages/listIngredients.php
+++ b/pages/listIngredients.php
@@ -47,11 +47,11 @@
    				<span class="visually-hidden">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu dropdown-menu-right">
-                <?php foreach (loadModules('suppliers') as $search){ ?>
+                <?php foreach (loadModules('suppliers') as $provider){ ?>
                 <li>
-                    <a href="#" class="supplier dropdown-item" data-provider="<?=$search['fileName']?>">
-                        <span class="<?=$search['icon']?>"></span>
-                        <span class="label-icon"><?=$search['name']?></span>
+                    <a href="#" class="supplier dropdown-item" data-provider="<?=$provider['fileName']?>">
+                        <span class="<?=$provider['icon']?>"></span>
+                        <span class="label-icon"><?=$provider['name']?></span>
                     </a>
                 </li>
                 <?php } ?>
@@ -78,99 +78,100 @@
    </thead>
 </table>
 
-<script type="text/javascript">
+<script>
 
 $(document).ready(function() {
 	
 	var tdDataIng = $('#tdDataIng').DataTable( {
-	columnDefs: [
-		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [1,2,5,6,7,8,9]},
-		{ responsivePriority: 1, targets: 0 }
-	],
-	search: {
-    	search: "<?=$_GET['search']?>"
-  	},
-	dom: 'lr<"#advanced_search">tip',
-	initComplete: function(settings, json) {
-        $("#advanced_search").html('<span><hr /><a href="#" class="advanced_search_box mb-2" data-bs-toggle="modal" data-bs-target="#adv_search">Advanced Search</a></span>');
-		$("#tdDataIng_filter").detach().appendTo('#pv_search');
-    },
-	processing: true,
-	serverSide: true,
-	searching: true,
-	responsive: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: 'Blending...',
-		zeroRecords: '<div class="alert alert-warning"><strong>Nothing found, try <a href="#" data-bs-toggle="modal" data-bs-target="#adv_search">advanced</a> search instead?</strong></div>',
-		search: 'Quick Search:',
-		searchPlaceholder: 'Name, CAS, EINECS, IUPAC, odor..',
+		columnDefs: [
+			{ className: 'pv_vertical_middle text-center', targets: '_all' },
+			{ orderable: false, targets: [1,2,5,6,7,8,9]},
+			{ responsivePriority: 1, targets: 0 }
+		],
+		search: {
+			search: "<?=$_GET['search']?>"
 		},
-	ajax: {	
-		url: '/core/list_ingredients_data.php',
-		type: 'POST',
-		data: function(d) {
-            d.provider = $('#pv_search_btn').attr('data-provider')
-			d.adv = '<?=$_GET['adv']?:0?>'
-			d.profile = '<?=$_GET['profile']?:null?>'
-			d.name = '<?=$_GET['name']?:null?>'
-			d.cas = '<?=$_GET['cas']?:null?>'
-			d.einecs = '<?=$_GET['einecs']?:null?>'
-			d.odor = '<?=$_GET['odor']?:null?>'
-			d.cat = '<?=$_GET['cat']?:null?>'
-			d.synonym = '<?=$_GET['synonym']?:null?>'
-			if (d.order.length>0){
-                d.order_by = d.columns[d.order[0].column].data
-                d.order_as = d.order[0].dir
-            }
-        },
-		dataType: 'json',
-	},
-	columns: [
-		  { data : 'name', title: 'Name', render: iName },
-		  { data : 'IUPAC', title: 'IUPAC' },
-		  { data : 'odor', title: 'Description'},
-		  { data : 'profile', title: 'Profile', render: iProfile },
-		  { data : 'category', title: 'Category', render: iCategory },
-		  { data : 'usage.limit', title: '<?=ucfirst($defCatClass)?>(%)', render: iLimit},
-		  { data : 'stock', title: 'In Stock <i rel="tip" title="The total amount available in stock from all suppliers." class="fas fa-info-circle"></i></span>', render: iStock},
-		  { data : null, title: 'Supplier(s)', render: iSuppliers},
-		  { data : null, title: 'Document(s)', render: iDocs},
-
-		  { data : null, title: '', render: actions},		   
-	],
-	order: [[ 0, 'asc' ]],
-	lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
-	pageLength: 20,
-	displayLength: 20,
-	drawCallback: function( settings ) {
-		extrasShow();
-    },
-	stateSave: true,
-	stateDuration : -1,
-	stateLoadCallback: function (settings, callback) {
-       	$.ajax( {
-           	url: '/core/update_user_settings.php?set=listIngredients&action=load',
-           	dataType: 'json',
-           	success: function (json) {
-               	callback( json );
-				if(json.search.search !== undefined){
-					$('#ing_search').val(json.search.search);
+		dom: 'lr<"#advanced_search">tip',
+		initComplete: function(settings, json) {
+			$("#advanced_search").html('<span><hr /><a href="#" class="advanced_search_box mb-2" data-bs-toggle="modal" data-bs-target="#adv_search">Advanced Search</a></span>');
+			$("#tdDataIng_filter").detach().appendTo('#pv_search');
+		},
+		processing: true,
+		serverSide: true,
+		searching: true,
+		responsive: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: 'Blending...',
+			zeroRecords: '<div class="alert alert-warning"><strong>Nothing found, try <a href="#" data-bs-toggle="modal" data-bs-target="#adv_search">advanced</a> search instead?</strong></div>',
+			search: 'Quick Search:',
+			searchPlaceholder: 'Name, CAS, EINECS, IUPAC, odor..',
+			},
+		ajax: {	
+			url: '/core/list_ingredients_data.php',
+			type: 'POST',
+			data: function(d) {
+				d.pvSearch =  '<?=$_GET['search']?>'
+				d.provider = $('#pv_search_btn').attr('data-provider')
+				d.adv = '<?=$_GET['adv']?:0?>'
+				d.profile = '<?=$_GET['profile']?:null?>'
+				d.name = '<?=$_GET['name']?:null?>'
+				d.cas = '<?=$_GET['cas']?:null?>'
+				d.einecs = '<?=$_GET['einecs']?:null?>'
+				d.odor = '<?=$_GET['odor']?:null?>'
+				d.cat = '<?=$_GET['cat']?:null?>'
+				d.synonym = '<?=$_GET['synonym']?:null?>'
+				if (d.order.length>0){
+					d.order_by = d.columns[d.order[0].column].data
+					d.order_as = d.order[0].dir
+				}
+			},
+			dataType: 'json',
+		},
+		columns: [
+			  { data : 'name', title: 'Name', render: iName },
+			  { data : 'IUPAC', title: 'IUPAC' },
+			  { data : 'odor', title: 'Description'},
+			  { data : 'profile', title: 'Profile', render: iProfile },
+			  { data : 'category', title: 'Category', render: iCategory },
+			  { data : 'usage.limit', title: '<?=ucfirst($defCatClass)?>(%)', render: iLimit},
+			  { data : 'stock', title: 'In Stock <i rel="tip" title="The total amount available in stock from all suppliers." class="fas fa-info-circle"></i></span>', render: iStock},
+			  { data : null, title: 'Supplier(s)', render: iSuppliers},
+			  { data : null, title: 'Document(s)', render: iDocs},
+	
+			  { data : null, title: '', render: actions},		   
+		],
+		order: [[ 0, 'asc' ]],
+		lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
+		pageLength: 20,
+		displayLength: 20,
+		drawCallback: function( settings ) {
+			extrasShow();
+		},
+		stateSave: true,
+		stateDuration : -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listIngredients&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+					if(json.search.search !== undefined){
+						$('#ing_search').val(json.search.search);
+					}
 				}
-           	}
-       	});
-    },
-    stateSaveCallback: function (settings, data) {
-	   $.ajax({
-		 url: "/core/update_user_settings.php?set=listIngredients&action=save",
-		 data: data,
-		 dataType: "json",
-		 type: "POST"
-	  });
-	},
+			});
+		},
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			 url: "/core/update_user_settings.php?set=listIngredients&action=save",
+			 data: data,
+			 dataType: "json",
+			 type: "POST"
+		  });
+		},
 
-});
+	});
 	    
 	$('#ing_search').keyup(function() {
         tdDataIng.search($(this).val()).draw();
@@ -182,324 +183,323 @@
 		tdDataIng.search(ingSearch.txt).draw();
 	});
 	
- 
-});
-					   
-function iName(data, type, row, meta){
-	var alg = '';
-	if(row.allergen == 1){
-		var alg = '<span class="ing_alg"><i rel="tip" title="Allergen" class="fas fa-exclamation-triangle"></i></span>';
-	}
-	if(meta.settings.json.source == 'local'){
-		
-		return '<a class="popup-link listIngName listIngName-with-separator" href="/pages/mgmIngredient.php?id=' + btoa(row.name) + '">' + data + '</a>'+alg+'<span class="listIngHeaderSub">CAS: <i class="pv_point_gen subHeaderCAS" rel="tip" title="Click to copy cas" id="cCAS" data-name="'+row.cas+'">'+row.cas+'</i> | EINECS: <i class="pv_point_gen subHeaderCAS">'+row.einecs+'</i></span>';
-	}else{
-		return '<a class="listIngName listIngName-with-separator" href="#">' + data + '</a>'+alg+'<span class="listIngHeaderSub">CAS: <i class="pv_point_gen subHeaderCAS" rel="tip" title="Click to copy cas" id="cCAS" data-name="'+row.cas+'">'+row.cas+'</i> | EINECS: <i class="pv_point_gen subHeaderCAS">'+row.einecs+'</i></span>';
-	}
-}
-
-
-function iProfile(data, type, row, meta){
-	if(meta.settings.json.source == 'local'){
-		if(row.profile){
-			return '<img src="/img/Pyramid/Pyramid_Slice_'+row.profile+'.png" class="img_ing_prof"/>';    
+ 					   
+	function iName(data, type, row, meta){
+		var alg = '';
+		if(row.allergen == 1){
+			alg = '<span class="ing_alg"><i rel="tip" title="Allergen" class="fas fa-exclamation-triangle"></i></span>';
+		}
+		if(meta.settings.json.source == 'local'){
+			
+			return '<a class="popup-link listIngName listIngName-with-separator" href="/pages/mgmIngredient.php?id=' + btoa(row.name) + '">' + data + '</a>'+alg+'<span class="listIngHeaderSub">CAS: <i class="pv_point_gen subHeaderCAS" rel="tip" title="Click to copy cas" id="cCAS" data-name="'+row.cas+'">'+row.cas+'</i> | EINECS: <i class="pv_point_gen subHeaderCAS">'+row.einecs+'</i></span>';
 		}else{
-			return '<img src="/img/pv_molecule.png" class="img_ing_prof"/>';
+			return '<a class="listIngName listIngName-with-separator" href="#">' + data + '</a>'+alg+'<span class="listIngHeaderSub">CAS: <i class="pv_point_gen subHeaderCAS" rel="tip" title="Click to copy cas" id="cCAS" data-name="'+row.cas+'">'+row.cas+'</i> | EINECS: <i class="pv_point_gen subHeaderCAS">'+row.einecs+'</i></span>';
 		}
-	}else{
-		return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
 	}
-}
-
-function iStock(data, type, row, meta){
-	if (row.physical_state == 1) {
-		var ingUnit = "ml";
-	}else if (row.physical_state == 2) {
-		var ingUnit = "gr";
-	}
-	if(meta.settings.json.source == 'local'){
-		return '<a class="popup-link" rel="tip" title="'+ingUnit+'" href="/pages/views/ingredients/ingSuppliers.php?id=' + row.id + '&standAlone=1">' + data + '</a>';
-	}else{
-		return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
-	}
-}
-
-function iCategory(data, type, row){
-	if(row.category.image){
-		return '<i rel="tip" title="'+row.category.name+'"><img class="img_ing ing_ico_list" src="'+row.category.image+'" /></i>';    
-	}else{
-		return '<img src="/img/pv_molecule.png" class="img_ing_prof"/>';
+	
+	
+	function iProfile(data, type, row, meta){
+		if(meta.settings.json.source == 'local'){
+			if(row.profile){
+				return '<img src="/img/Pyramid/Pyramid_Slice_'+row.profile+'.png" class="img_ing_prof"/>';    
+			}else{
+				return '<img src="/img/pv_molecule.png" class="img_ing_prof"/>';
+			}
+		}else{
+			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
+		}
 	}
-}
-
-function iLimit(data, type, row){
-	var byPassIFRA = '';
-	if(row.info.byPassIFRA == 1){
-		var byPassIFRA = '<span class="ing_alg"> <i rel="tip" title="IFRA record is bypassed" class="fas fa-exclamation-triangle"></i></span>';	
+	
+	function iStock(data, type, row, meta){
+		if (row.physical_state == 1) {
+			var ingUnit = "ml";
+		}else if (row.physical_state == 2) {
+			var ingUnit = "gr";
+		}
+		if(meta.settings.json.source == 'local'){
+			return '<a class="popup-link" rel="tip" title="'+ingUnit+'" href="/pages/views/ingredients/ingSuppliers.php?id=' + row.id + '&standAlone=1">' + data + '</a>';
+		}else{
+			return '<i class="pv_point_gen" rel="tip" title="Not available in PV Online">N/A</i>';
+		}
 	}
 	
-	if(row.usage.reason == 1){
-		var reason = 'Recommendation';
-	}else if(row.usage.reason == 2){
-		var reason = 'Restriction';
-	}else if(row.usage.reason == 3){
-		var reason = 'Specification';
-	}else if(row.usage.reason == 4){
-		var reason = 'Prohibition';
-	}else{
-		var reason = row.usage.reason;
+	function iCategory(data, type, row){
+		if(row.category.image){
+			return '<i rel="tip" title="'+row.category.name+'"><img class="img_ing ing_ico_list" src="'+row.category.image+'" /></i>';    
+		}else{
+			return '<img src="/img/pv_molecule.png" class="img_ing_prof"/>';
+		}
 	}
 	
-	return '<i class="pv_point_gen pv_gen_li" rel="tip" title="'+reason+'">'+row.usage.limit+'</i>'+byPassIFRA;
-}
-
-function iSuppliers(data, type, row){
-	if(row.supplier){
-	data ='<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-store mx-2"></i><span class="badge badge-light">'+row.supplier.length+'</span></button><div class="dropdown-menu dropdown-menu-right">';
-	for (var key in row.supplier) {
-		if (row.supplier.hasOwnProperty(key)) {
-			data+='<li><a class="dropdown-item" target="_blank" href="'+row.supplier[key].link+'"><i class="fa fa-store mx-2"></i>'+row.supplier[key].name+'</a></li>';
+	function iLimit(data, type, row){
+		var byPassIFRA = '';
+		if(row.info.byPassIFRA == 1){
+			var byPassIFRA = '<span class="ing_alg"> <i rel="tip" title="IFRA record is bypassed" class="fas fa-exclamation-triangle"></i></span>';	
 		}
-	}                
-	data+='</div></div></td>';
-}else{
-		data = 'N/A';
+		
+		if(row.usage.reason == 1){
+			var reason = 'Recommendation';
+		}else if(row.usage.reason == 2){
+			var reason = 'Restriction';
+		}else if(row.usage.reason == 3){
+			var reason = 'Specification';
+		}else if(row.usage.reason == 4){
+			var reason = 'Prohibition';
+		}else{
+			var reason = row.usage.reason;
+		}
+		
+		return '<i class="pv_point_gen pv_gen_li" rel="tip" title="'+reason+'">'+row.usage.limit+'</i>'+byPassIFRA;
 	}
-	return data;
-}
-
-function iDocs(data, type, row){
-	if(row.document){	
-		data ='<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-file-alt mx-2"></i><span class="badge badge-light">'+row.document.length+'</span></button><div class="dropdown-menu dropdown-menu-right">';
-		for (var key in row.document) {
-			if (row.document.hasOwnProperty(key)) {
-				data+='<a class="dropdown-item popup-link" href="/pages/viewDoc.php?id='+row.document[key].id+'"><i class="fa fa-file-alt mx-2"></i>'+row.document[key].name+'</a>';
+	
+	function iSuppliers(data, type, row){
+		if(row.supplier){
+		data ='<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-store mx-2"></i><span class="badge badge-light">'+row.supplier.length+'</span></button><div class="dropdown-menu dropdown-menu-right">';
+		for (var key in row.supplier) {
+			if (row.supplier.hasOwnProperty(key)) {
+				data+='<li><a class="dropdown-item" target="_blank" href="'+row.supplier[key].link+'"><i class="fa fa-store mx-2"></i>'+row.supplier[key].name+'</a></li>';
 			}
 		}                
 		data+='</div></div></td>';
-	
-		}else{
+	}else{
 			data = 'N/A';
 		}
+		return data;
+	}
 	
-	return data;
-}
-
-
-function actions(data, type, row, meta){
-	if(meta.settings.json.source == 'PVOnline'){
-		data = '<div class="dropdown">' +
-			'<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
-				'<ul class="dropdown-menu dropdown-menu-right">' + 
-				'<li><a rel="tip" title="Import '+ row.name +'" class="pv_point_gen" id="impIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-download mx-2"></i>Import to local DB</a></li>'; 
-		data += '</ul></div>';		
-	}else{//Treat the rest as local
-		data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
-				'<ul class="dropdown-menu dropdown-menu-right">';
-		data += '<li><a href="/pages/mgmIngredient.php?id='+btoa(row.name)+'" class="dropdown-item popup-link"><i class="fas fa-edit mx-2"></i>Manage</a></li>';
+	function iDocs(data, type, row){
+		if(row.document){	
+			data ='<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-file-alt mx-2"></i><span class="badge badge-light">'+row.document.length+'</span></button><div class="dropdown-menu dropdown-menu-right">';
+			for (var key in row.document) {
+				if (row.document.hasOwnProperty(key)) {
+					data+='<a class="dropdown-item popup-link" href="/pages/viewDoc.php?id='+row.document[key].id+'"><i class="fa fa-file-alt mx-2"></i>'+row.document[key].name+'</a>';
+				}
+			}                
+			data+='</div></div></td>';
 		
-		data += '<li><a class="dropdown-item" href="/pages/export.php?format=json&kind=single-ingredient&id=' + row.id + '" rel="tip" title="Export '+ row.name +' as JSON" ><i class="fas fa-download mx-2"></i>Export as JSON</a></li>';
-
-		data += '<div class="dropdown-divider"></div>';
-
-		data += '<li><a rel="tip" title="Remove '+ row.name +'" class="dropdown-item pv_point_gen text-danger" id="rmIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-trash mx-2"></i>Delete</a></li>'; 
-		data += '</ul></div>';		
+			}else{
+				data = 'N/A';
+			}
+		
+		return data;
 	}
 	
-	return data;
-}
-
-
-$('#tdDataIng').on('click', '[id*=cCAS]', function () {
-	var copy = {};
-	copy.Name = $(this).attr('data-name');
-	const el = document.createElement('textarea');
-    el.value = copy.Name;
-    document.body.appendChild(el);
-    el.select();
-    document.execCommand('copy');
-    document.body.removeChild(el);
-});
-
-
-
-$('#tdDataIng').on('click', '[id*=impIng]', function () {
-	var ing = {};
-	ing.ID = $(this).attr('data-id');
-	ing.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm ingredient import",
-       message : 'Import <strong>'+ ing.Name +'</strong>\'s data from PVOnline? <hr/><div class="alert alert-warning"><strong>Please note: data maybe incorrect and/or incomplete, you should validate them after import.</strong></div>',
-       buttons :{
-           main: {
-               label : "Import",
-               className : "btn-warning",
-               callback: function (){
-	    			
-				$.ajax({
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						action: "import",
-						source: "PVOnline",
-						kind: "ingredient",
-						ing_id: ing.ID,
-						},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+	
+	function actions(data, type, row, meta){
+		if(meta.settings.json.source == 'PVOnline'){
+			data = '<div class="dropdown">' +
+				'<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+					'<ul class="dropdown-menu dropdown-menu-right">' + 
+					'<li><a rel="tip" title="Import '+ row.name +'" class="pv_point_gen" id="impIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-download mx-2"></i>Import to local DB</a></li>'; 
+			data += '</ul></div>';		
+		}else{//Treat the rest as local
+			data = '<div class="dropdown">' +
+				'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+					'<ul class="dropdown-menu dropdown-menu-right">';
+			data += '<li><a href="/pages/mgmIngredient.php?id='+btoa(row.name)+'" class="dropdown-item popup-link"><i class="fas fa-edit mx-2"></i>Manage</a></li>';
+			
+			data += '<li><a class="dropdown-item" href="/pages/export.php?format=json&kind=single-ingredient&id=' + row.id + '" rel="tip" title="Export '+ row.name +' as JSON" ><i class="fas fa-download mx-2"></i>Export as JSON</a></li>';
+	
+			data += '<div class="dropdown-divider"></div>';
+	
+			data += '<li><a rel="tip" title="Remove '+ row.name +'" class="dropdown-item pv_point_gen text-danger" id="rmIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-trash mx-2"></i>Delete</a></li>'; 
+			data += '</ul></div>';		
+		}
+		
+		return data;
+	}
+	
+	
+	$('#tdDataIng').on('click', '[id*=cCAS]', function () {
+		var copy = {};
+		copy.Name = $(this).attr('data-name');
+		const el = document.createElement('textarea');
+		el.value = copy.Name;
+		document.body.appendChild(el);
+		el.select();
+		document.execCommand('copy');
+		document.body.removeChild(el);
+	});
+	
+	
+	
+	$('#tdDataIng').on('click', '[id*=impIng]', function () {
+		var ing = {};
+		ing.ID = $(this).attr('data-id');
+		ing.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm ingredient import",
+		   message : 'Import <strong>'+ ing.Name +'</strong>\'s data from PVOnline? <hr/><div class="alert alert-warning"><strong>Please note: data maybe incorrect and/or incomplete, you should validate them after import.</strong></div>',
+		   buttons :{
+			   main: {
+				   label : "Import",
+				   className : "btn-warning",
+				   callback: function (){
+						
+					$.ajax({
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							action: "import",
+							source: "PVOnline",
+							kind: "ingredient",
+							ing_id: ing.ID,
+							},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-
-$('#tdDataIng').on('click', '[id*=rmIng]', function () {
-	var ing = {};
-	ing.ID = $(this).attr('data-id');
-	ing.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm ingredient deletion",
-       message : 'Permanently delete <strong>'+ ing.Name +'</strong> and its data?',
-       buttons :{
-           main: {
-               label : "Delete",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						ingredient: "delete",
-						ing_id: ing.ID,
-						},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_ingredients_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	
+	$('#tdDataIng').on('click', '[id*=rmIng]', function () {
+		var ing = {};
+		ing.ID = $(this).attr('data-id');
+		ing.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm ingredient deletion",
+		   message : 'Permanently delete <strong>'+ ing.Name +'</strong> and its data?',
+		   buttons :{
+			   main: {
+				   label : "Delete",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							ingredient: "delete",
+							ing_id: ing.ID,
+							},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_ingredients_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-function reload_ingredients_data() {
-    $('#tdDataIng').DataTable().ajax.reload(null, true);
-}
-
-$(".input-group-btn .dropdown-menu li a").click(function () {
-	var selText = $(this).html();
-	var provider = $(this).attr('data-provider');
-	  
-	$(this).parents(".input-group-btn").find(".btn-search").html(selText);
-	$(this).parents(".input-group-btn").find(".btn-search").attr('data-provider',provider);
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
 	
-	$('#pv_search_btn').click();
-	if($('#pv_search_btn').data().provider == 'local'){
-		$("#advanced_search").html('<span><hr /><a href="#" class="advanced_search_box" data-bs-toggle="modal" data-bs-target="#adv_search">Advanced Search</a></span>');
-	}else{
-		$("#advanced_search").html('');
+	function reload_ingredients_data() {
+		$('#tdDataIng').DataTable().ajax.reload(null, true);
 	}
 	
-});
-
-function extrasShow() {
-	$('[rel=tip]').tooltip({
-        "html": true,
-        "delay": {"show": 100, "hide": 0},
-     });
-	$('.popup-link').magnificPopup({
-		type: 'iframe',
-		closeOnContentClick: false,
-		closeOnBgClick: false,
-		showCloseBtn: true,
+	$(".input-group-btn .dropdown-menu li a").click(function () {
+		var selText = $(this).html();
+		var provider = $(this).attr('data-provider');
+		  
+		$(this).parents(".input-group-btn").find(".btn-search").html(selText);
+		$(this).parents(".input-group-btn").find(".btn-search").attr('data-provider',provider);
+		
+		$('#pv_search_btn').click();
+		if($('#pv_search_btn').data().provider == 'local'){
+			$("#advanced_search").html('<span><hr /><a href="#" class="advanced_search_box" data-bs-toggle="modal" data-bs-target="#adv_search">Advanced Search</a></span>');
+		}else{
+			$("#advanced_search").html('');
+		}
+		
 	});
-};
-
-
-$('#wipe_all_ing').click(function() {
-    
-	bootbox.dialog({
-       title: "Confirm ingredient wipe",
-       message : 'This will remove ALL your ingredients from the database.\nThis cannot be reverted so please make sure you have taken a backup first.',
-       buttons :{
-           main: {
-               label : "DELETE ALL",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						ingredient_wipe: "true",
-						},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+	
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			"html": true,
+			"delay": {"show": 100, "hide": 0},
+		 });
+		$('.popup-link').magnificPopup({
+			type: 'iframe',
+			closeOnContentClick: false,
+			closeOnBgClick: false,
+			showCloseBtn: true,
+		});
+	};
+	
+	
+	$('#wipe_all_ing').click(function() {
+		
+		bootbox.dialog({
+		   title: "Confirm ingredient wipe",
+		   message : 'This will remove ALL your ingredients from the database.\nThis cannot be reverted so please make sure you have taken a backup first.',
+		   buttons :{
+			   main: {
+				   label : "DELETE ALL",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							ingredient_wipe: "true",
+							},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
 });
 </script>
 <script src="/js/import.ingredients.js"></script>
diff --git a/pages/mgmIngredient.php b/pages/mgmIngredient.php
index e1f0409c..9a90d9e3 100755
--- a/pages/mgmIngredient.php
+++ b/pages/mgmIngredient.php
@@ -11,13 +11,6 @@
 
 
 $ingID = sanChar(mysqli_real_escape_string($conn, base64_decode($_GET["id"])));
-if($ingID){
-	if(empty(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE name = '$ingID'")))){
-		if(mysqli_query($conn, "INSERT INTO ingredients (name) VALUES ('$ingID')")){
-			$msg='<div class="alert alert-info alert-dismissible"><strong>Info:</strong> ingredient '.$ingID.' added</div>';
-		}
-	}
-}
 
 $res_ingTypes = mysqli_query($conn, "SELECT id,name FROM ingTypes ORDER BY name ASC");
 $res_ingStrength = mysqli_query($conn, "SELECT id,name FROM ingStrength ORDER BY name ASC");
@@ -61,10 +54,12 @@
 	
 <script>
 var myIngName = "<?=$ing['name']?>";
-var myIngID = '';
+var newIngName = "<?=$_GET["newIngName"]?>";
+var newIngCAS = "<?=$_GET["newIngCAS"]?>";
+var myIngID;
 <?php if($ing['id']){ ?>
 
-var myIngID = "<?=$ing['id']?>";
+myIngID = "<?=$ing['id']?>";
 var myCAS = "<?=$ing['cas']?>";
 var myPCH = "<?=$settings['pubChem']?>";
 <?php } ?>
@@ -353,93 +348,6 @@
 
 
 
-<script>
-
-$(document).ready(function() {
-	$('[rel=tip]').tooltip({placement: 'auto'});
-
-	$('#general').on('click', '[id*=saveGeneral]', function () {
-		<?php if(empty($ing['id'])){ ?>
-			if($.trim($("#name").val()) == ''){
-				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>Ingredient name is required');
-				$('.toast-header').removeClass().addClass('toast-header alert-danger');
-				$('.toast').toast('show');
-				return;
-   			}
-		<?php } ?>
-		$.ajax({ 
-			url: '/pages/update_data.php', 
-			type: 'POST',
-			data: {
-				manage: 'ingredient',
-				tab: 'general',
-				ingID: myIngID,
-				
-				name: $("#name").val(),
-				INCI: $("#INCI").val(),
-				cas: $("#cas").val(),
-				einecs: $("#einecs").val(),
-				reach: $("#reach").val(),
-				fema: $("#fema").val(),
-				isAllergen: $("#isAllergen").is(':checked'),
-				purity: $("#purity").val(),
-				solvent: $("#solvent").val(),
-				profile: $("#profile").val(),					
-				type: $("#type").val(),
-				strength: $("#strength").val(),
-				category: $("#category").val(),
-				physical_state: $("#physical_state").val(),
-				odor: $("#odor").val(),
-				notes: $("#notes").val(),
-				<?php if($ing['name']){?>
-					ing: '<?=$ing['name'];?>'
-				<?php } ?>
-			},
-			dataType: 'json',   			
-			success: function (data) {
-				if(data.success){
-					$('#mgmIngHeaderCAS').html($("#cas").val());
-					$('#IUPAC').html($("#INCI").val());
-					
-					$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-					$('.toast-header').removeClass().addClass('toast-header alert-success');
-				}else{
-					$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-					$('.toast-header').removeClass().addClass('toast-header alert-danger');
-				}
-				$('.toast').toast('show');
-						
-				if ($('#name').val()) {
-					window.location = 'mgmIngredient.php?id=' + btoa($('#name').val());
-				}
-			    <?php if($ing['id']){ ?>
-				reload_overview();
-				<?php } ?>
-			},
-			error: function (xhr, status, error) {
-				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
-				$('.toast-header').removeClass().addClass('toast-header alert-danger');
-				$('.toast').toast('show');
-			}
-		});
-	});
-
-
-
-	$('#purity').bind('input', function() {
-		var purity = $(this).val();
-		if(purity == 100){
-			$("#solvent").prop("disabled", true); 
-			$("#solvent").val(''); 
-		}else{
-			$("#solvent").prop("disabled", false);
-		}
-		$('.selectpicker').selectpicker('refresh');
-	});
-	
-});//end doc
-
-</script>
 <script src="/js/mgmIngredient.js"></script>
 <script src="/js/ingredient.tabs.js"></script>
 
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 267339b9..9157ba06 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -5,6 +5,7 @@
 
 require_once(__ROOT__.'/inc/opendb.php');
 require_once(__ROOT__.'/inc/settings.php');
+require_once(__ROOT__.'/func/php-settings.php');
 
 
 $id = mysqli_real_escape_string($conn, $_GET['id']);
@@ -679,6 +680,18 @@ function ingName(data, type, row, meta){
 		profile_class ='';
 	}
 	
+	if(row.chk_ingredient_code === 4){
+		data ='<div class="btn-group"><a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'+row.ingredient.name+'</a><div class="dropdown-menu dropdown-menu-right">';
+		
+		data+='<li><a class="dropdown-item popup-link" href="/pages/mgmIngredient.php?newIngName='+ btoa(row.ingredient.name) +'&newIngCAS='+ row.ingredient.cas +'"><i class="fa-solid fa-flask-vial mx-2"></i>Create ingredient</a></li>';
+	
+		data+='<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_ingredients_json"><i class="bi bi-filetype-json mx-2"></i>Import from JSON</a></li>';
+		data+='<li><a class="dropdown-item" href="https://online.perfumersvault.com/query/' + row.ingredient.name+ '" target="_blank"><i class="fa-solid fa-cloud-arrow-down mx-2"></i>Search PV Online<i class="ml-2 fa-solid fa-arrow-up-right-from-square"></i></a></li>';
+				
+		data+='</div></div>';
+		return data;
+	}
+	
 	if(row.ingredient.enc_id){
 		data = contains + '<a class="popup-link '+ex+'" href="/pages/mgmIngredient.php?id=' + row.ingredient.enc_id + '">' + data + '</a> '+ chkIng + profile_class;
 	}else{
@@ -810,6 +823,7 @@ function ingActions(data, type, row, meta){
 <script src="/js/fullformula.view.js"></script>
 <script src="/js/mark/jquery.mark.min.js"></script>
 <script src="/js/mark/datatables.mark.js"></script>
+<script src="/js/import.ingredients.js"></script>
 
 <!--Schedule Formula-->
 <div class="modal fade" id="schedule_to_make" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="schedule_to_make" aria-hidden="true">
@@ -1028,3 +1042,43 @@ function ingActions(data, type, row, meta){
     </div>
   </div>
 </div>
+
+<!--IMPORT JSON MODAL-->
+<div class="modal fade" id="import_ingredients_json" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="import_ingredients_json" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Import ingredients from a JSON file</h5>
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      	<div id="JSRestMsg"></div>
+      	<div class="progress">  
+       	  <div id="uploadProgressBar" class="progress-bar" role="progressbar" aria-valuemin="0"></div>
+      	</div>
+      	<div id="backupArea">
+          <div class="form-group">
+              <label class="col-md-3 control-label">JSON file:</label>
+              <div class="col-md-8">
+                 <input type="file" name="backupFile" id="backupFile" class="form-control" />
+              </div>
+          </div>
+          	<div class="col-md-12">
+            	 <hr />
+             	<p><strong>IMPORTANT:</strong></p>
+              	<ul>
+                	<li><div id="raw" data-size="<?=getMaximumFileUploadSizeRaw()?>">Maximum file size: <strong><?=getMaximumFileUploadSize()?></strong></div></li>
+                	<li>Any ingredient with the same id will be replaced. Please make sure you have taken a backup before imporing a JSON file.</li>
+              	</ul>
+            </div>
+          </div>
+      	</div>
+	  		<div class="modal-footer">
+        		<input type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="btnCloseBK" value="Cancel">
+        		<input type="submit" name="btnRestore" class="btn btn-primary" id="btnRestoreIngredients" value="Import">
+      		</div>
+  		</div>  
+	</div>
+</div>
\ No newline at end of file
diff --git a/pages/views/ingredients/mgmGeneral.php b/pages/views/ingredients/mgmGeneral.php
index 1c67747d..2c77ac2c 100644
--- a/pages/views/ingredients/mgmGeneral.php
+++ b/pages/views/ingredients/mgmGeneral.php
@@ -6,15 +6,19 @@
 
 
 $ingID = mysqli_real_escape_string($conn, base64_decode($_GET["id"]));
-
-
 $res_ingTypes = mysqli_query($conn, "SELECT id,name FROM ingTypes ORDER BY name ASC");
 $res_ingStrength = mysqli_query($conn, "SELECT id,name FROM ingStrength ORDER BY name ASC");
 $res_ingCategory = mysqli_query($conn, "SELECT id,image,name,notes FROM ingCategory ORDER BY name ASC");
 $res_ingProfiles = mysqli_query($conn, "SELECT id,name FROM ingProfiles ORDER BY id ASC");
-
 $ing = mysqli_fetch_array(mysqli_query($conn, "SELECT * FROM ingredients WHERE name = '$ingID'"));
 
+if($_GET["newIngName"]){
+	$newIngName = mysqli_real_escape_string($conn, base64_decode($_GET["newIngName"]));
+
+	if(empty(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE name = '$ingName'")))){
+		$ing['cas'] = mysqli_real_escape_string($conn, $_GET["newIngCAS"]);
+	}
+}
 ?>
 <h3>General</h3>
 <hr>
@@ -24,7 +28,7 @@
  <?php if(empty($ingID)){?>
  <div class="mt-3 col-12">
     <label for="name" class="form-label">Name</label>
-    <input name="name" type="text" class="form-control" id="name" />
+    <input name="name" type="text" class="form-control" id="name" value="<?=$newIngName?>">
  </div>
  <?php } ?>
   
@@ -39,21 +43,21 @@
   </div>
   <div class="mt-3 col-md-6">
     <label for="einecs" class="form-label">EINECS</label>
-    <input name="einecs" type="text" class="form-control" id="einecs" value="<?php echo $ing['einecs']; ?>" />
+    <input name="einecs" type="text" class="form-control" id="einecs" value="<?php echo $ing['einecs']; ?>">
   </div>
   <div class="mt-3 col-md-6">
     <label for="reach" class="form-label">REACH</label>
-    <input name="reach" type="text" class="form-control" id="reach" value="<?php echo $ing['reach']; ?>" />
+    <input name="reach" type="text" class="form-control" id="reach" value="<?php echo $ing['reach']; ?>">
   </div>
 
   <div class="mt-3 col-md-6">
     <label for="fema" class="form-label">FEMA</label>
-    <input name="fema" type="text" class="form-control" id="fema" value="<?php echo $ing['FEMA']; ?>" />
+    <input name="fema" type="text" class="form-control" id="fema" value="<?php echo $ing['FEMA']; ?>">
   </div>
   
   <div class="mt-3 col-md-6">
     <label for="purity" class="form-label">Purity</label>
-    <input name="purity" type="text" class="form-control" id="purity" value="<?php echo $ing['purity']?: '100'; ?>" />
+    <input name="purity" type="text" class="form-control" id="purity" value="<?php echo $ing['purity']?: '100'; ?>">
   </div>
   <div class="mt-3 col-md-6">
     <label for="solvent" class="form-label">Solvent</label>
@@ -139,7 +143,9 @@
 	$('#general').on('click', '[id*=saveGeneral]', function () {
 		<?php if(empty($ing['id'])){ ?>
 			if($.trim($("#name").val()) == ''){
-				$('#msg_general').html('<div class="alert alert-danger mx-2"><strong>Name is required</strong></div>');
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>Ingredient name is required');
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				$('.toast').toast('show');
 				return;
    			}
 		<?php } ?>
@@ -150,13 +156,13 @@
 				manage: 'ingredient',
 				tab: 'general',
 				ingID: myIngID,
-				
 				name: $("#name").val(),
 				INCI: $("#INCI").val(),
 				cas: $("#cas").val(),
 				einecs: $("#einecs").val(),
 				reach: $("#reach").val(),
 				fema: $("#fema").val(),
+				isAllergen: $("#isAllergen").is(':checked'),
 				purity: $("#purity").val(),
 				solvent: $("#solvent").val(),
 				profile: $("#profile").val(),					
@@ -176,19 +182,25 @@
 					$('#mgmIngHeaderCAS').html($("#cas").val());
 					$('#IUPAC').html($("#INCI").val());
 					
-					var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+					$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+					$('.toast-header').removeClass().addClass('toast-header alert-success');
 				}else{
-					var msg ='<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+					$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+					$('.toast-header').removeClass().addClass('toast-header alert-danger');
 				}
-				
-				$('#msg_general').html(msg);
-				
+				$('.toast').toast('show');
+						
 				if ($('#name').val()) {
 					window.location = 'mgmIngredient.php?id=' + btoa($('#name').val());
 				}
 			    <?php if($ing['id']){ ?>
 				reload_overview();
 				<?php } ?>
+			},
+			error: function (xhr, status, error) {
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				$('.toast').toast('show');
 			}
 		});
 	});
diff --git a/releasenotes.md b/releasenotes.md
index c5886c7e..c4ba188a 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,6 @@
 Whats New in v11.0
 --------------------------
+- Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON
 - Added editability in IFRA Library
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed
 - This release may include more changes, for full details please refer to the CHANGELOG

From d3ed1fbc3d7fe334d17657161e5581214f78813d Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 08:44:14 +0100
Subject: [PATCH 18/44] [01a0b1e] - Removed unknown value when a git commit
 cannot be found

---
 pages/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/footer.php b/pages/footer.php
index c28b18f3..6105013b 100755
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -17,7 +17,7 @@
 }
 
 if (empty($commit)) {
-    $commit = 'unknown'; // fallback if commit is not found in any source
+    $commit = ''; // fallback if commit is not found in any source
 }
 
 	

From d5c0a2e36bed997ae9b4345a07ffa44129213a93 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 09:37:28 +0100
Subject: [PATCH 19/44] [d3ed1fb] - Removed unknown value when a git commit
 cannot be found

---
 CHANGELOG.md                        |  3 +++
 pages/update_data.php               |  5 +++--
 pages/views/ingredients/pubChem.php | 24 ++++++++++++++++++------
 releasenotes.md                     |  1 +
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12d38108..44a3001e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 ### Version 11.0
+- Changed datatype for PubChem to json
+- Added a button to view ingredient data in PubChem
+- Fix PubChemData update button
 - Added more error handling for ajax requests
 - Added a var (pvSearch) to search ingredients in the local datatabase
 - Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON
diff --git a/pages/update_data.php b/pages/update_data.php
index 6ca39ba3..6adc0c46 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -728,10 +728,11 @@
 		$q.= mysqli_query($conn, "UPDATE ingredients SET INCI = '$InChI' WHERE cas='$cas'");
 	}
 	if($q){
-		echo '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>Data updated!</div>';
+		$response["success"] = 'Local data updated';
 	}else{
-		echo '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>Unable to update data!</div>';
+		$response["error"] = 'Unable to update data';
 	}
+	echo json_encode($response);
 	return;
 }
 
diff --git a/pages/views/ingredients/pubChem.php b/pages/views/ingredients/pubChem.php
index 8fd8ce92..ef20a252 100644
--- a/pages/views/ingredients/pubChem.php
+++ b/pages/views/ingredients/pubChem.php
@@ -45,9 +45,9 @@
 <script>
 $(document).ready(function(){
   
-$('#pubChemDataJ').on('click', '[id*=btnUpdatePub]', function () {
+$('#btnUpdatePub').on('click', function () {
 	$.ajax({ 
-		url: 'update_data.php', 
+		url: '/pages/update_data.php', 
 		type: 'POST',
 		data: {
 			pubChemData: 'update',
@@ -58,12 +58,19 @@
 			CanonicalSMILES: "<?=$CanonicalSMILES?>",
 			ExactMass: "<?=$ExactMass?>",
 			cas: "<?=$cas?>",
-			},
-		dataType: 'html',
+		},
+		dataType: 'JSON',
 		success: function (data) {
-			$('#ingMsg').html(data);
+			$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+			$('.toast-header').removeClass().addClass('toast-header alert-success');
 			$("#INCI").val("<?=$InChI?>");
 			reload_overview();
+			$('.toast').toast('show');
+		},
+		error: function (xhr, status, error) {
+			$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+			$('.toast-header').removeClass().addClass('toast-header alert-danger');
+			$('.toast').toast('show');
 		}
 	  });             
 });
@@ -99,7 +106,12 @@
       </div>
       <div class="row">
         <div class="col-12">
-          <input type="submit" class="btn btn-primary" name="btnUpdatePub" id="btnUpdatePub" value="Update data" />
+        	<input class="btn btn-primary mx-2" name="btnUpdatePub" id="btnUpdatePub" value="Update data" />
+	    	<a href="https://pubchem.ncbi.nlm.nih.gov/#query=<?=$cas?>" target="_blank">
+    			<button class="btn btn-warning" name="btnViewPub" id="btnViewPub">
+        			View in PubChem <i class="fa-solid fa-arrow-up-right-from-square"></i>
+    			</button>
+			</a>
         </div>
       </div>
     </div>
diff --git a/releasenotes.md b/releasenotes.md
index c4ba188a..1bb791d3 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,6 @@
 Whats New in v11.0
 --------------------------
+- Added a button to view ingredient data in PubChem
 - Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON
 - Added editability in IFRA Library
 - Treat empty IFRA Library values (PROHIBITION, SPECIFICATION) as 0% allowed

From 0db7773a7c8e5544d2b2737f88b17ef6da60f475 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 09:41:32 +0100
Subject: [PATCH 20/44] [d5c0a2e] - Renamed button to close instead of cancel
 in IFRA document generation

---
 pages/views/formula/finishedProduct.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/views/formula/finishedProduct.php b/pages/views/formula/finishedProduct.php
index 4bc0e7ea..a4770ed1 100644
--- a/pages/views/formula/finishedProduct.php
+++ b/pages/views/formula/finishedProduct.php
@@ -146,7 +146,7 @@
             </select>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
         <input type="submit" class="btn btn-primary" id="generateDoc" value="Generate">
       </div>
     </div>

From 9789880882536586f24e3a18f27cf56f03e0c142 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 11:34:05 +0100
Subject: [PATCH 21/44] [0db7773] - Added maximum allowed usage for a formula

---
 CHANGELOG.md               |  1 +
 core/full_formula_data.php | 15 +++++++++++++++
 pages/formula.php          |  1 +
 pages/viewFormula.php      |  3 +--
 releasenotes.md            |  1 +
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44a3001e..c965271b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Added maximum allowed usage for a formula
 - Changed datatype for PubChem to json
 - Added a button to view ingredient data in PubChem
 - Fix PubChemData update button
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index a3f9eafd..284a042a 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -281,6 +281,20 @@
 $m['formula_description'] = (string)$meta['notes'];
 $m['protected'] = (bool)$meta['isProtected'];
 
+$lastValAccepted = null;
+
+for ($c = 1; $c <= 100; $c++) {
+	$result = validateFormula($meta['fid'], $m['concentration'], $c, $mg['total_mg'], $defCatClass, $settings['qStep']);
+
+    if ($result === 0) {
+        $lastValAccepted = $c;
+    } else {
+        break;
+    }
+}
+$m['max_usage'] = $lastValAccepted;
+
+/*
 $new_conc = $_GET['final_total_ml'] ?: 100/100*$_GET['final_type_conc'] ?: 100;
 $carrier = $_GET['final_total_ml'] ?: 100 - $new_conc;
 
@@ -300,6 +314,7 @@
 $compliance['message'] = (string)$val_msg ?: 'Formula is IFRA compliant';
 	
 $response['compliance'] = $compliance;
+*/
 $response['meta'] = $m;
 
 $s['load_time'] = microtime(true) - $starttime;
diff --git a/pages/formula.php b/pages/formula.php
index 1e75accc..8af721ad 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -73,6 +73,7 @@
                         <a href="#" rel="tip" class="text-secondary-emphasis" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
                           <?= ucfirst($meta['catClass']) ?>
                         </a>
+                        <div id="max_usage"></div>
                       </span>
                     </h5>
                   </div>
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 9157ba06..cd535a5d 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -180,8 +180,7 @@
 			 $td.eq(5).html("Total: " + response.meta['concentration'] + "%" );
 			 $td.eq(7).html("Total: " + response.meta['currency'] + response.meta['total_cost'] + '<i rel="tip" title="The total price for the 100% concentration." class="mx-2 pv_point_gen fas fa-info-circle"></i>');
 			 $(formula_table.columns(7).header()).html("Final Concentration " + response.meta['product_concentration'] + "%");
-			 //$('#compliance').html('<div class="alert alert-warning"><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + response.compliance.message + '</div>');
-			 //console.log(response.compliance);
+			 $('#max_usage').html('Max usage: ' + response.meta['max_usage'] + '% <i rel="tip" title="This represents the maximum allowed usage in a final product for the selected IFRA category" class="mx-2 pv_point_gen fas fa-info-circle"></i>');
 		 }
       },
 	  
diff --git a/releasenotes.md b/releasenotes.md
index 1bb791d3..579ab29f 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,6 @@
 Whats New in v11.0
 --------------------------
+- Added maximum allowed usage for a formula
 - Added a button to view ingredient data in PubChem
 - Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON
 - Added editability in IFRA Library

From cefeea00096159b57c600dbd5c439edf9cf21d0b Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 11:41:12 +0100
Subject: [PATCH 22/44] [9789880] - Added maximum allowed usage for a formula

---
 core/full_formula_data.php | 6 +++++-
 pages/viewFormula.php      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index 284a042a..df1365b2 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -292,8 +292,12 @@
         break;
     }
 }
-$m['max_usage'] = $lastValAccepted;
+if( $lastValAccepted !== null) {
 
+	$m['max_usage'] = $lastValAccepted;
+} else {
+	$m['max_usage'] = 'Unable to calculate';
+}
 /*
 $new_conc = $_GET['final_total_ml'] ?: 100/100*$_GET['final_type_conc'] ?: 100;
 $carrier = $_GET['final_total_ml'] ?: 100 - $new_conc;
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index cd535a5d..45a708be 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -180,7 +180,7 @@
 			 $td.eq(5).html("Total: " + response.meta['concentration'] + "%" );
 			 $td.eq(7).html("Total: " + response.meta['currency'] + response.meta['total_cost'] + '<i rel="tip" title="The total price for the 100% concentration." class="mx-2 pv_point_gen fas fa-info-circle"></i>');
 			 $(formula_table.columns(7).header()).html("Final Concentration " + response.meta['product_concentration'] + "%");
-			 $('#max_usage').html('Max usage: ' + response.meta['max_usage'] + '% <i rel="tip" title="This represents the maximum allowed usage in a final product for the selected IFRA category" class="mx-2 pv_point_gen fas fa-info-circle"></i>');
+			 $('#max_usage').html('Max usage: ' + response.meta['max_usage'] + '% <i rel="tip" title="This represents the maximum allowed usage in a final product for the selected IFRA category. <p>If your database contains missing or incomplete ingredient data, this will fail.</p>" class="mx-2 pv_point_gen fas fa-info-circle"></i>');
 		 }
       },
 	  

From b7bd5b358d2c6bd2e1d5c3c575b7cf5f4d604c0c Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 12:53:12 +0100
Subject: [PATCH 23/44] [cefeea0] - Fix formula analysis IFRA function

---
 core/list_formula_analysis_data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/list_formula_analysis_data.php b/core/list_formula_analysis_data.php
index a5cf864c..0ab05ab1 100644
--- a/core/list_formula_analysis_data.php
+++ b/core/list_formula_analysis_data.php
@@ -48,8 +48,8 @@
 	}
 	
 	$r['contained_percentage'] = $conc_p;
+    $u = searchIFRA($get_data_ing['cas'], $get_data_ing['name'], null, $defCatClass);
 
-    $u = explode(' - ', searchIFRA($get_data_ing['cas'], $get_data_ing['name'], null, $defCatClass));
     $r['max_allowed'] = $u[0];
 
     $response['data'][] = $r;

From 8ad065bf89ffec15353bad7fa08d46458b500f55 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 13:05:38 +0100
Subject: [PATCH 24/44] [b7bd5b3] - Added maximum allowed usage for a formula

---
 core/full_formula_data.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index df1365b2..9995b4fa 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -194,7 +194,6 @@
 	}
 
 	$u = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass);
-	//$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
 	
 	if(($u['val'] || $u['type'] && $ing_q['byPassIFRA'] == 0)){
 		$r['usage_limit'] = (float)number_format((float)$u['val'], $settings['qStep']);
@@ -284,7 +283,7 @@
 $lastValAccepted = null;
 
 for ($c = 1; $c <= 100; $c++) {
-	$result = validateFormula($meta['fid'], $m['concentration'], $c, $mg['total_mg'], $defCatClass, $settings['qStep']);
+	$result = validateFormula($meta['fid'], 100, $c, $mg['total_mg'], $defCatClass, $settings['qStep']);
 
     if ($result === 0) {
         $lastValAccepted = $c;

From fdd6e23d477fdc1febc3cb652451d6dbb8b86999 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:33:36 +0100
Subject: [PATCH 25/44] [8ad065b] - Main page updates

---
 index.php | 319 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 170 insertions(+), 149 deletions(-)

diff --git a/index.php b/index.php
index d5bc2a7e..9f6e0af5 100755
--- a/index.php
+++ b/index.php
@@ -162,188 +162,209 @@ function chkUpdate() {
 </script>
 </head>
 <body id="page-top">
-  <div id="wrapper">
+  <div id="wrapper" class="d-flex">
     <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark">
       <a class="sidebar-brand d-flex align-items-center justify-content-center" href="/index.php">
-        <div class="sidebar-brand-icon mt-4 mb-4">            
-        	<div class="pvLogo"><img src="/img/logo.png"></div>
+        <div class="sidebar-brand-icon mt-4 mb-4">
+          <div class="pvLogo">
+            <img src="/img/logo.png" alt="Logo">
+          </div>
         </div>
-      </a>        
+      </a>
+      
       <!-- Divider -->
       <hr class="sidebar-divider my-2">
+
       <li class="nav-item">
         <a class="nav-link" href="/?do=dashboard">
           <i class="fas fa-fw fa-tachometer-alt"></i>
-          <span>Dashboard</span></a>
+          <span>Dashboard</span>
+        </a>
       </li>
+
       <li class="nav-item">
-            <?php 
-            $formulaPages = ['listFormulas', 'genFinishedProduct', 'compareFormulas', 'Formula', 'sellFormula', 'scheduledFormulas', 'batches'];
-            $isActiveFormula = in_array($_GET['do'], $formulaPages);
-            
-            $expand_f = $isActiveFormula ? 'show' : ''; 
-            $class_f = $isActiveFormula ? '' : 'collapsed'; 
-            $aria_f = $isActiveFormula ? 'true' : 'false';
-            ?> 
-            <a class="nav-link <?php echo $class_f; ?>" href="#" data-bs-toggle="collapse" data-bs-target="#collapseFormulas" aria-expanded="<?php echo $aria_f; ?>" aria-controls="collapseFormulas">
-                <i class="fas fa-fw fa-flask"></i>
-                <span>Formula Management</span>
-            </a>
-            <div id="collapseFormulas" class="collapse <?php echo $expand_f; ?>">
-                <div class="bg-white py-2 collapse-inner rounded">
-                    <a class="collapse-item <?php echo $_GET['do'] === 'listFormulas' || $_GET['do'] === 'Formula' ? 'active' : ''; ?>" href="/?do=listFormulas">Formulas</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'compareFormulas' ? 'active' : ''; ?>" href="/?do=compareFormulas">Compare Formulas</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'genFinishedProduct' ? 'active' : ''; ?>" href="/?do=genFinishedProduct">Finished Product</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'sellFormula' ? 'active' : ''; ?>" href="/?do=sellFormula">Sell Formula</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'scheduledFormulas' ? 'active' : ''; ?>" href="/?do=scheduledFormulas">Scheduled Formulas <span class="badge badge-danger badge-counter"><?php echo countPending(NULL, NULL, $conn); ?></span></a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'batches' ? 'active' : ''; ?>" href="/?do=batches">Batch history</a>
-                </div>
-            </div>
-        </li>
-        <li class="nav-item">
-            <?php 
-            $inventoryPages = ['ingredients', 'bottles', 'lids', 'suppliers', 'customers', 'compounds'];
-            $isActiveInventory = in_array($_GET['do'], $inventoryPages);
-            $expand = $isActiveInventory ? 'show' : ''; 
-            $class = $isActiveInventory ? '' : 'collapsed'; 
-            $aria = $isActiveInventory ? 'true' : 'false';
-            ?> 
-            <a class="nav-link <?php echo $class; ?>" href="#" data-bs-toggle="collapse" data-bs-target="#collapseInventory" aria-expanded="<?php echo $aria; ?>" aria-controls="collapseInventory">
-                <i class="fas fa-fw fa-warehouse"></i>
-                <span>Inventory</span>
+        <?php 
+          $formulaPages = ['listFormulas', 'genFinishedProduct', 'compareFormulas', 'Formula', 'sellFormula', 'scheduledFormulas', 'batches'];
+          $isActiveFormula = in_array($_GET['do'], $formulaPages);
+          
+          $expand_f = $isActiveFormula ? 'show' : ''; 
+          $class_f = $isActiveFormula ? '' : 'collapsed'; 
+          $aria_f = $isActiveFormula ? 'true' : 'false';
+        ?> 
+        <a class="nav-link <?php echo $class_f; ?>" href="#" data-bs-toggle="collapse" data-bs-target="#collapseFormulas" aria-expanded="<?php echo $aria_f; ?>" aria-controls="collapseFormulas">
+          <i class="fas fa-fw fa-flask"></i>
+          <span>Formula Management</span>
+        </a>
+        <div id="collapseFormulas" class="collapse <?php echo $expand_f; ?>">
+          <div class="bg-white py-2 collapse-inner rounded">
+            <a class="collapse-item <?php echo $_GET['do'] === 'listFormulas' || $_GET['do'] === 'Formula' ? 'active' : ''; ?>" href="/?do=listFormulas">Formulas</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'compareFormulas' ? 'active' : ''; ?>" href="/?do=compareFormulas">Compare Formulas</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'genFinishedProduct' ? 'active' : ''; ?>" href="/?do=genFinishedProduct">Finished Product</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'sellFormula' ? 'active' : ''; ?>" href="/?do=sellFormula">Sell Formula</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'scheduledFormulas' ? 'active' : ''; ?>" href="/?do=scheduledFormulas">Scheduled Formulas 
+              <span class="badge badge-danger badge-counter"><?php echo countPending(NULL, NULL, $conn); ?></span>
             </a>
-            <div id="collapseInventory" class="collapse <?php echo $expand; ?>">
-                <div class="bg-white py-2 collapse-inner rounded">
-                    <a class="collapse-item <?php echo $_GET['do'] === 'ingredients' ? 'active' : ''; ?>" href="/?do=ingredients">Ingredients</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'suppliers' ? 'active' : ''; ?>" href="/?do=suppliers">Suppliers</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'customers' ? 'active' : ''; ?>" href="/?do=customers">Customers</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'compounds' ? 'active' : ''; ?>" href="/?do=compounds">Compounds</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'bottles' ? 'active' : ''; ?>" href="/?do=bottles">Bottles</a>
-                    <a class="collapse-item <?php echo $_GET['do'] === 'lids' ? 'active' : ''; ?>" href="/?do=lids">Bottle Lids</a>
-                </div>
-            </div>
-        </li>    
-        <li class="nav-item">
+            <a class="collapse-item <?php echo $_GET['do'] === 'batches' ? 'active' : ''; ?>" href="/?do=batches">Batch history</a>
+          </div>
+        </div>
+      </li>
+
+      <li class="nav-item">
+        <?php 
+          $inventoryPages = ['ingredients', 'bottles', 'lids', 'suppliers', 'customers', 'compounds'];
+          $isActiveInventory = in_array($_GET['do'], $inventoryPages);
+          $expand = $isActiveInventory ? 'show' : ''; 
+          $class = $isActiveInventory ? '' : 'collapsed'; 
+          $aria = $isActiveInventory ? 'true' : 'false';
+        ?> 
+        <a class="nav-link <?php echo $class; ?>" href="#" data-bs-toggle="collapse" data-bs-target="#collapseInventory" aria-expanded="<?php echo $aria; ?>" aria-controls="collapseInventory">
+          <i class="fas fa-fw fa-warehouse"></i>
+          <span>Inventory</span>
+        </a>
+        <div id="collapseInventory" class="collapse <?php echo $expand; ?>">
+          <div class="bg-white py-2 collapse-inner rounded">
+            <a class="collapse-item <?php echo $_GET['do'] === 'ingredients' ? 'active' : ''; ?>" href="/?do=ingredients">Ingredients</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'suppliers' ? 'active' : ''; ?>" href="/?do=suppliers">Suppliers</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'customers' ? 'active' : ''; ?>" href="/?do=customers">Customers</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'compounds' ? 'active' : ''; ?>" href="/?do=compounds">Compounds</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'bottles' ? 'active' : ''; ?>" href="/?do=bottles">Bottles</a>
+            <a class="collapse-item <?php echo $_GET['do'] === 'lids' ? 'active' : ''; ?>" href="/?do=lids">Bottle Lids</a>
+          </div>
+        </div>
+      </li>
+
+      <li class="nav-item">
         <a class="nav-link" href="/?do=IFRA">
           <i class="fas fa-fw fa-university"></i>
-          <span>IFRA Library</span></a>
-        </li>
-        <li class="nav-item">
+          <span>IFRA Library</span>
+        </a>
+      </li>
+      <li class="nav-item">
         <a class="nav-link" href="/?do=statistics">
           <i class="fas fa-fw fa-chart-area"></i>
-          <span>Statistics</span></a>
-        </li>
-      	<hr class="sidebar-divider d-none d-md-block">
-        <li class="nav-item">
+          <span>Statistics</span>
+        </a>
+      </li>
+
+      <hr class="sidebar-divider d-none d-md-block">
+
+      <li class="nav-item">
         <a class="nav-link" href="/?do=marketplace">
           <i class="fas fa-fw fa-store"></i>
-          <span>Marketplace</span></a>
-       </li>
-       <hr class="sidebar-divider d-none d-md-block">
-        <li class="nav-item">
+          <span>Marketplace</span>
+        </a>
+      </li>
+
+      <hr class="sidebar-divider d-none d-md-block">
+
+      <li class="nav-item">
         <a class="nav-link" href="/?do=genSDS">
           <i class="fas fa-square-poll-horizontal"></i>
           My SDSs
-          <span class="mr-5 mt-2 position-absolute top-0 translate-middle badge badge-danger badge-counter">BETA</span>
-          </a>
-       </li>
+          <span class="position-absolute top-0 translate-middle badge badge-danger badge-counter">BETA</span>
+        </a>
+      </li>
+
       <hr class="sidebar-divider d-none d-md-block">
     </ul>
+
     <?php
-		if($_GET['do'] == 'Formula'){
-			require_once(__ROOT__.'/pages/formula.php');
-		}elseif($_GET['do'] == 'ingredients'){
-			require_once(__ROOT__.'/pages/ingredients.php');
-		}elseif($_GET['do'] == 'settings'){
-			require_once(__ROOT__.'/pages/settings.php');
-		}elseif($_GET['do'] == 'marketplace'){
-			require_once(__ROOT__.'/pages/views/pvOnline/marketPlace.php');
-		}elseif($_GET['do'] == 'statistics'){
-			require_once(__ROOT__.'/pages/statistics.php');
-		}elseif($_GET['do'] == 'IFRA'){
-			require_once(__ROOT__.'/pages/IFRA.php');
-		}elseif($_GET['do'] == 'listFormulas'){
-		?>
+      if ($_GET['do'] == 'Formula') {
+          require_once(__ROOT__.'/pages/formula.php');
+      } elseif ($_GET['do'] == 'ingredients') {
+          require_once(__ROOT__.'/pages/ingredients.php');
+      } elseif ($_GET['do'] == 'settings') {
+          require_once(__ROOT__.'/pages/settings.php');
+      } elseif ($_GET['do'] == 'marketplace') {
+          require_once(__ROOT__.'/pages/views/pvOnline/marketPlace.php');
+      } elseif ($_GET['do'] == 'statistics') {
+          require_once(__ROOT__.'/pages/statistics.php');
+      } elseif ($_GET['do'] == 'IFRA') {
+          require_once(__ROOT__.'/pages/IFRA.php');
+      } elseif ($_GET['do'] == 'listFormulas') {
+    ?>
         <div id="content-wrapper" class="d-flex flex-column">
-			<?php require_once(__ROOT__.'/pages/top.php'); ?>
-        <div class="container-fluid">
-          <div>
-          <div class="card shadow mb-4">
-           
-            <div id="list_formulas">
-            	<div class="loader-center">
-                	<div class="loader"></div>
+          <?php require_once(__ROOT__.'/pages/top.php'); ?>
+          <div class="container-fluid">
+            <div>
+              <div class="card shadow mb-4">
+                <div id="list_formulas">
+                  <div class="loader-center">
+                    <div class="loader"></div>
                     <div class="loader-text"></div>
+                  </div>
                 </div>
-             </div>
-           </div>
+              </div>
+            </div>
           </div>
         </div>
-	   </div>
-		<?php
-		}elseif($_GET['do'] == 'genFinishedProduct'){
-			require_once(__ROOT__.'/pages/genFinishedProduct.php');		
-		}elseif($_GET['do'] == 'bottles'){
-			require_once(__ROOT__.'/pages/bottles.php');		
-		}elseif($_GET['do'] == 'addBottle'){
-			require_once(__ROOT__.'/pages/addBottle.php');		
-		}elseif($_GET['do'] == 'lids'){
-			require_once(__ROOT__.'/pages/lids.php');
-		}elseif($_GET['do'] == 'addLid'){
-			require_once(__ROOT__.'/pages/addLid.php');	
-		}elseif($_GET['do'] == 'batches'){
-			require_once(__ROOT__.'/pages/views/formula/batches.php');
-		}elseif($_GET['do'] == 'scheduledFormulas'){
-			require_once(__ROOT__.'/pages/scheduledFormulas.php');	
-		}elseif($_GET['do'] == 'cart'){
-			require_once(__ROOT__.'/pages/cart.php');	
-		}elseif($_GET['do'] == 'suppliers'){
-			require_once(__ROOT__.'/pages/suppliers.php');
-		}elseif($_GET['do'] == 'sellFormula'){
-			require_once(__ROOT__.'/pages/sellFormula.php');
-		}elseif($_GET['do'] == 'customers'){
-			require_once(__ROOT__.'/pages/customers.php');
-		}elseif($_GET['do'] == 'compareFormulas'){
-			require_once(__ROOT__.'/pages/compareFormulas.php');
-		}elseif($_GET['do'] == 'compounds'){
-			require_once(__ROOT__.'/pages/compounds.php');
-		}elseif($_GET['do'] == 'genSDS'){
-			require_once(__ROOT__.'/pages/views/regulatory/listSDS.php');				
-		}else{
-			require_once(__ROOT__.'/pages/dashboard.php');
-		}
-	?>
-<?php require_once(__ROOT__.'/pages/footer.php'); ?>
+    <?php
+      } elseif ($_GET['do'] == 'genFinishedProduct') {
+          require_once(__ROOT__.'/pages/genFinishedProduct.php');        
+      } elseif ($_GET['do'] == 'bottles') {
+          require_once(__ROOT__.'/pages/bottles.php');        
+      } elseif ($_GET['do'] == 'addBottle') {
+          require_once(__ROOT__.'/pages/addBottle.php');        
+      } elseif ($_GET['do'] == 'lids') {
+          require_once(__ROOT__.'/pages/lids.php');
+      } elseif ($_GET['do'] == 'addLid') {
+          require_once(__ROOT__.'/pages/addLid.php');    
+      } elseif ($_GET['do'] == 'batches') {
+          require_once(__ROOT__.'/pages/views/formula/batches.php');
+      } elseif ($_GET['do'] == 'scheduledFormulas') {
+          require_once(__ROOT__.'/pages/scheduledFormulas.php');    
+      } elseif ($_GET['do'] == 'cart') {
+          require_once(__ROOT__.'/pages/cart.php');    
+      } elseif ($_GET['do'] == 'suppliers') {
+          require_once(__ROOT__.'/pages/suppliers.php');
+      } elseif ($_GET['do'] == 'sellFormula') {
+          require_once(__ROOT__.'/pages/sellFormula.php');
+      } elseif ($_GET['do'] == 'customers') {
+          require_once(__ROOT__.'/pages/customers.php');
+      } elseif ($_GET['do'] == 'compareFormulas') {
+          require_once(__ROOT__.'/pages/compareFormulas.php');
+      } elseif ($_GET['do'] == 'compounds') {
+          require_once(__ROOT__.'/pages/compounds.php');
+      } elseif ($_GET['do'] == 'genSDS') {
+          require_once(__ROOT__.'/pages/views/regulatory/listSDS.php');                
+      } else {
+          require_once(__ROOT__.'/pages/dashboard.php');
+      }
+    ?>
+    
+    <?php require_once(__ROOT__.'/pages/footer.php'); ?>
 
-<!-- TOAST -->
-<div class="position-fixed top-0 start-50 translate-middle-x p-3" style="z-index: 11">
-  <div id="liveToast" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true" data-bs-autohide="true">
-    <div class="toast-header">
-      <strong class="me-auto" id="toast-title">...</strong>
-      <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+    <!-- TOAST -->
+    <div class="position-fixed top-0 start-50 translate-middle-x p-3" style="z-index: 11">
+      <div id="liveToast" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true" data-bs-autohide="true">
+        <div class="toast-header">
+          <strong class="me-auto" id="toast-title">...</strong>
+          <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+        </div>
+      </div>
     </div>
-  </div>
-</div>
 
-<!--RELEASE NOTES-->
-<div class="modal fade" id="release_notes" tabindex="-1" role="dialog" aria-labelledby="release_notes" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="release_notes">Release Notes</h5>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
+    <!-- RELEASE NOTES -->
+    <div class="modal fade" id="release_notes" tabindex="-1" role="dialog" aria-labelledby="release_notes" aria-hidden="true">
+      <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="release_notes">Release Notes</h5>
+            <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            Thanks for updating to version <strong><?php echo $ver;?></strong>
+            <p><pre><?php echo file_get_contents('releasenotes.md','r');?></pre></p>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+            </div>
+          </div>
+        </div>
       </div>
-      <div class="modal-body">
-		Thanks for updating to version <strong><?php echo $ver;?></strong> 
-	    <p><pre><?php echo file_get_contents('releasenotes.md','r');?></pre></p>
-	    <div class="modal-footer">
-	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-	   </div>
     </div>
   </div>
-</div>
-
 </body>
+
 </html>

From a8a01b28d4226f172760d49f2d1bbd25eed9703d Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:40:36 +0100
Subject: [PATCH 26/44] [fdd6e23] - Error handling

---
 pages/listFormulas.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pages/listFormulas.php b/pages/listFormulas.php
index ad7887f3..595fb3ed 100644
--- a/pages/listFormulas.php
+++ b/pages/listFormulas.php
@@ -395,6 +395,11 @@ className : "btn-danger",
 								$('.toast-header').removeClass().addClass('toast-header alert-danger');
 							}
 							$('.toast').toast('show');
+						},
+						error: function (xhr, status, error) {
+							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							$('.toast').toast('show');
 						}
 					  });
 					 return true;
@@ -439,6 +444,11 @@ className : "btn-danger",
 								$('.toast-header').removeClass().addClass('toast-header alert-danger');
 							}
 							$('.toast').toast('show');
+						},
+						error: function (xhr, status, error) {
+							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							$('.toast').toast('show');
 						}
 					});
 					

From cf3f957852b3d6c46d789340e90ff7ee87223526 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:41:43 +0100
Subject: [PATCH 27/44] [a8a01b2] - Error handling

---
 pages/listFormulas.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/listFormulas.php b/pages/listFormulas.php
index 595fb3ed..490c5238 100644
--- a/pages/listFormulas.php
+++ b/pages/listFormulas.php
@@ -489,6 +489,11 @@ className : "btn-secondary",
 				$('.toast-header').removeClass().addClass('toast-header alert-danger');
 			}
 			$('.toast').toast('show');
+		},
+		error: function (xhr, status, error) {
+			$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+			$('.toast-header').removeClass().addClass('toast-header alert-danger');
+			$('.toast').toast('show');
 		}
 	  });
 	});

From 6213cae668b663848df6ca667cd0bbb02951d3d5 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:42:30 +0100
Subject: [PATCH 28/44] [cf3f957] - Path update

---
 pages/listFormulas.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/listFormulas.php b/pages/listFormulas.php
index 490c5238..6f145aa2 100644
--- a/pages/listFormulas.php
+++ b/pages/listFormulas.php
@@ -516,7 +516,7 @@ className : "btn-secondary",
 			if(data.error){
 				var rmsg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.error+'</div>';
 			}else if(data.success){
-				var rmsg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><a href="?do=Formula&id='+data.success.id+'">'+data.success.msg+'</a></div>';
+				var rmsg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><a href="/?do=Formula&id='+data.success.id+'">'+data.success.msg+'</a></div>';
 				reload_formulas_data();
 				if($("#go_to_formula").prop("checked")){
 					window.location = "/?do=Formula&id=" + data.success.id

From 84ddccfd73662e88d3cdfaff4f7ad8df9a589be8 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:45:46 +0100
Subject: [PATCH 29/44] [6213cae] - Error handling

---
 pages/listIngredients.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/listIngredients.php b/pages/listIngredients.php
index 407ec66e..ee84c0ff 100644
--- a/pages/listIngredients.php
+++ b/pages/listIngredients.php
@@ -106,7 +106,7 @@
 			zeroRecords: '<div class="alert alert-warning"><strong>Nothing found, try <a href="#" data-bs-toggle="modal" data-bs-target="#adv_search">advanced</a> search instead?</strong></div>',
 			search: 'Quick Search:',
 			searchPlaceholder: 'Name, CAS, EINECS, IUPAC, odor..',
-			},
+		},
 		ajax: {	
 			url: '/core/list_ingredients_data.php',
 			type: 'POST',
@@ -484,6 +484,11 @@ className : "btn-danger",
 								$('.toast-header').removeClass().addClass('toast-header alert-danger');
 							}
 							$('.toast').toast('show');
+						},
+						error: function (xhr, status, error) {
+							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							$('.toast').toast('show');
 						}
 					});
 					

From 1f03d93a43ca09a613e1979390ee4fe5676065d1 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:51:15 +0100
Subject: [PATCH 30/44] [84ddccf] - Update discord invite for the header menu

---
 pages/top.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/top.php b/pages/top.php
index cf5b1c7e..4d2d17f4 100755
--- a/pages/top.php
+++ b/pages/top.php
@@ -68,7 +68,7 @@
                 </a>
                 
                 <div class="dropdown-divider"></div>
-                <a class="dropdown-item" href="https://discord.gg/dsQwDAem" target="_blank">
+                <a class="dropdown-item" href="https://discord.gg/WxNE8kR8ug" target="_blank">
                   <i class="fas fa-book fa-sm fa-fw mx-2 text-gray-400"></i>
                   Join our Discord Server
                 </a>

From b125f6925375aa530c37e25562e65f9f8e1166f3 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 14:55:19 +0100
Subject: [PATCH 31/44] [1f03d93] - Making SDS GA

---
 CHANGELOG.md | 1 +
 index.php    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c965271b..6c5436df 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Making SDS GA
 - Added maximum allowed usage for a formula
 - Changed datatype for PubChem to json
 - Added a button to view ingredient data in PubChem
diff --git a/index.php b/index.php
index 9f6e0af5..10f393c0 100755
--- a/index.php
+++ b/index.php
@@ -260,8 +260,7 @@ function chkUpdate() {
       <li class="nav-item">
         <a class="nav-link" href="/?do=genSDS">
           <i class="fas fa-square-poll-horizontal"></i>
-          My SDSs
-          <span class="position-absolute top-0 translate-middle badge badge-danger badge-counter">BETA</span>
+          <span>My SDSs</span>
         </a>
       </li>
 

From a4f4449d662dff9788eed0038ecd1939e93a6060 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 16:11:40 +0100
Subject: [PATCH 32/44] [b125f69] - Making ingredient profile customizable

---
 CHANGELOG.md                             |   1 +
 core/list_ingProf_data.php               |  24 +++
 db/pvault.sql                            |   3 +-
 db/updates/update_10.9-11.0.sql          |   3 +-
 js/import.categories.js                  |   4 +-
 js/settings.tabs.js                      | 123 ++++++++++-
 pages/settings.php                       | 128 ++----------
 pages/update_data.php                    |   9 +
 pages/update_settings.php                |  38 ++++
 pages/views/settings/listIngProfiles.php | 254 +++++++++++++++++++++++
 releasenotes.md                          |   1 +
 11 files changed, 466 insertions(+), 122 deletions(-)
 create mode 100644 core/list_ingProf_data.php
 create mode 100644 pages/views/settings/listIngProfiles.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c5436df..bf22968c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG
 ### Version 11.0
+- Making ingredient profile customizable
 - Making SDS GA
 - Added maximum allowed usage for a formula
 - Changed datatype for PubChem to json
diff --git a/core/list_ingProf_data.php b/core/list_ingProf_data.php
new file mode 100644
index 00000000..34f3a252
--- /dev/null
+++ b/core/list_ingProf_data.php
@@ -0,0 +1,24 @@
+<?php
+define('__ROOT__', dirname(__DIR__));
+
+require_once(__ROOT__ . '/inc/sec.php');
+require_once(__ROOT__ . '/inc/opendb.php');
+
+$response = ['data' => []];
+
+$cat_q = mysqli_query($conn, "SELECT id, name, notes, image FROM ingProfiles");
+
+if ($cat_q) {
+    while ($profs_res = mysqli_fetch_assoc($cat_q)) {
+        $response['data'][] = [
+            'id' => (int)$profs_res['id'],
+            'name' => (string)$profs_res['name'],
+            'notes' => (string)$profs_res['notes'] ?: 'N/A',
+            'image' => (string)$profs_res['image'] ?: null,
+        ];
+    }
+}
+
+header('Content-Type: application/json; charset=utf-8');
+echo json_encode($response);
+
diff --git a/db/pvault.sql b/db/pvault.sql
index f0b83d99..8f4b5af1 100755
--- a/db/pvault.sql
+++ b/db/pvault.sql
@@ -172,7 +172,8 @@ CREATE TABLE `ingCategory` (
 CREATE TABLE `ingProfiles` (
   `id` int(11) NOT NULL,
   `name` varchar(255) COLLATE utf8_general_ci NOT NULL,
-  `notes` text COLLATE utf8_general_ci DEFAULT NULL
+  `notes` text COLLATE utf8_general_ci DEFAULT NULL,
+  `image` LONGBLOB NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `ingProfiles` (`id`, `name`, `notes`) VALUES
diff --git a/db/updates/update_10.9-11.0.sql b/db/updates/update_10.9-11.0.sql
index e925aa14..4c767d7f 100644
--- a/db/updates/update_10.9-11.0.sql
+++ b/db/updates/update_10.9-11.0.sql
@@ -1,2 +1 @@
-TRUNCATE IFRALibrary;
-ALTER TABLE `IFRALibrary` CHANGE `cat1` `cat1` FLOAT NOT NULL DEFAULT '0', CHANGE `cat2` `cat2` FLOAT NOT NULL DEFAULT '0', CHANGE `cat3` `cat3` FLOAT NOT NULL DEFAULT '0', CHANGE `cat4` `cat4` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5A` `cat5A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5B` `cat5B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5C` `cat5C` FLOAT NOT NULL DEFAULT '0', CHANGE `cat5D` `cat5D` FLOAT NOT NULL DEFAULT '0', CHANGE `cat6` `cat6` FLOAT NOT NULL DEFAULT '0', CHANGE `cat7A` `cat7A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat7B` `cat7B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat8` `cat8` FLOAT NOT NULL DEFAULT '0', CHANGE `cat9` `cat9` FLOAT NOT NULL DEFAULT '0', CHANGE `cat10A` `cat10A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat10B` `cat10B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat11A` `cat11A` FLOAT NOT NULL DEFAULT '0', CHANGE `cat11B` `cat11B` FLOAT NOT NULL DEFAULT '0', CHANGE `cat12` `cat12` FLOAT NOT NULL DEFAULT '0';
+ALTER TABLE `ingProfiles` ADD `image` LONGBLOB NOT NULL AFTER `notes`; 
\ No newline at end of file
diff --git a/js/import.categories.js b/js/import.categories.js
index 1d377023..f75c9ed7 100644
--- a/js/import.categories.js
+++ b/js/import.categories.js
@@ -93,8 +93,8 @@ $('#btnRestoreCategories').click(function() {
 				var msg = '<div class="alert alert-success"><i class="fa-solid fa-circle-check mr-2"></i>'+data.success+'</div>';
 				$("#btnRestoreCategories").hide();
 				$("#backupArea").css('display', 'none');
-				reload_data();
-
+				//reload_data();
+				$('#tdDataCat, #frmDataCat').DataTable().ajax.reload(null, true);
 			}else if(data.error){
 				var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
 				$("#btnRestoreCategories").show();
diff --git a/js/settings.tabs.js b/js/settings.tabs.js
index 7dbb3e10..3daec3ce 100644
--- a/js/settings.tabs.js
+++ b/js/settings.tabs.js
@@ -12,7 +12,9 @@ $(document).ready(function() {
 	$('#cat_tab').on( 'click', function () {
 		list_cat();
 	});
-	
+	$('#prof_tab').on( 'click', function () {
+		list_prof();
+	})	
 	$('#frmCat_tab').on( 'click', function () {
 		list_fcat();
 	});
@@ -61,5 +63,124 @@ $(document).ready(function() {
 		get_integrations();
 	});
 	
+		function list_cat(){
+		$.ajax({ 
+			url: '/pages/views/settings/listCat.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_cat').html(data);
+			}
+		});
+	};
+	
+	function list_prof(){
+		$.ajax({ 
+			url: '/pages/views/settings/listIngProfiles.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_prof').html(data);
+			}
+		});
+	};
+	
+	function list_fcat(){
+		$.ajax({ 
+			url: '/pages/views/settings/listFrmCat.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_fcat').html(data);
+			}
+		});
+	};
+	
+	function list_ptypes(){
+		$.ajax({ 
+			url: '/pages/views/settings/perfume_types.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_ptypes').html(data);
+			}
+		});
+	};
+	
+	function list_templates(){
+		$.ajax({ 
+			url: '/pages/views/settings/templates.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_templates').html(data);
+			}
+		});
+	};
+	
+	function list_sds_settings(){
+		$.ajax({ 
+			url: '/pages/views/settings/sds.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#list_sds_settings').html(data);
+			}
+		});
+	};
+	
+	function get_maintenance(){
+		$.ajax({ 
+			url: '/pages/views/settings/maintenance.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#maintenance').html(data);
+			}
+		});
+	};
+	
+	function get_integrations(){
+		$.ajax({ 
+			url: '/pages/views/settings/integrations.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#integrations').html(data);
+			}
+		});
+	};
+	
+	function get_about(){
+		$.ajax({ 
+			url: '/pages/views/settings/about.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#about').html(data);
+			}
+		});
+	};
+	
+	function get_api(){
+		$.ajax({ 
+			url: '/pages/views/settings/api.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#api').html(data);
+			}
+		});
+	};
+	
+	function get_general(){
+		$.ajax({ 
+			url: '/pages/views/settings/general.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#general').html(data);
+			}
+		});
+	};
+	
+	function get_brand(){
+		$.ajax({ 
+			url: '/pages/views/settings/branding.php', 
+			dataType: 'html',
+			success: function (data) {
+				$('#brand').html(data);
+			}
+		});
+	};
 	get_general();
 });
\ No newline at end of file
diff --git a/pages/settings.php b/pages/settings.php
index eda695e2..622d3fe8 100755
--- a/pages/settings.php
+++ b/pages/settings.php
@@ -5,11 +5,6 @@
 require_once(__ROOT__.'/inc/settings.php');
 require_once(__ROOT__.'/func/php-settings.php');
 ?>
-<script>
-$(function() {
-  $("#settings").tabs();
-});
-</script>
 <div class="container-fluid">
 
 <h2 class="m-0 mb-4"><a href="/?do=settings">Settings</a></h2>
@@ -17,6 +12,7 @@
      <ul>
          <li class="active"><a href="#general" id="general_tab" role="tab" data-bs-toggle="tab">General</a></li>
          <li><a href="#categories" id="cat_tab" role="tab" data-bs-toggle="tab">Ingredient Categories</a></li>
+         <li><a href="#profiles" id="prof_tab" role="tab" data-bs-toggle="tab">Ingredient Profiles</a></li>
          <li><a href="#frmCat" id="frmCat_tab" role="tab" data-bs-toggle="tab">Formula Categories</a></li>
          <li><a href="#perfumeTypes" id="perfume_types_tab" role="tab" data-bs-toggle="tab">Perfume Types</a></li>
          <li><a href="#templates" id="templates_tab" role="tab" data-bs-toggle="tab">HTML Templates</a></li>
@@ -48,7 +44,14 @@
             </div>
         </div>
      </div> 
-     
+     <div id="profiles">
+        <div id="list_prof">
+            <div class="loader-center">
+                <div class="loader"></div>
+                <div class="loader-text"></div>
+            </div>
+        </div>
+     </div>      
      <div id="frmCat">
     	<div id="fcatMsg"></div>
         <div id="list_fcat">
@@ -130,117 +133,10 @@
 
 
 <script>
+$(document).ready(function() {
+	$("#settings").tabs();
+});
 
-function list_cat(){
-	$.ajax({ 
-		url: '/pages/views/settings/listCat.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#list_cat').html(data);
-		}
-	});
-};
-
-
-function list_fcat(){
-	$.ajax({ 
-		url: '/pages/views/settings/listFrmCat.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#list_fcat').html(data);
-		}
-	});
-};
-
-function list_ptypes(){
-	$.ajax({ 
-		url: '/pages/views/settings/perfume_types.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#list_ptypes').html(data);
-		}
-	});
-};
-
-function list_templates(){
-	$.ajax({ 
-		url: '/pages/views/settings/templates.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#list_templates').html(data);
-		}
-	});
-};
-
-function list_sds_settings(){
-	$.ajax({ 
-		url: '/pages/views/settings/sds.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#list_sds_settings').html(data);
-		}
-	});
-};
-
-function get_maintenance(){
-	$.ajax({ 
-		url: '/pages/views/settings/maintenance.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#maintenance').html(data);
-		}
-	});
-};
-
-function get_integrations(){
-	$.ajax({ 
-		url: '/pages/views/settings/integrations.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#integrations').html(data);
-		}
-	});
-};
-
-function get_about(){
-	$.ajax({ 
-		url: '/pages/views/settings/about.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#about').html(data);
-		}
-	});
-};
-
-function get_api(){
-	$.ajax({ 
-		url: '/pages/views/settings/api.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#api').html(data);
-		}
-	});
-};
-
-function get_general(){
-	$.ajax({ 
-		url: '/pages/views/settings/general.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#general').html(data);
-		}
-	});
-};
-
-function get_brand(){
-	$.ajax({ 
-		url: '/pages/views/settings/branding.php', 
-		dataType: 'html',
-		success: function (data) {
-			$('#brand').html(data);
-		}
-	});
-};
 </script>
 <script src="/js/settings.tabs.js"></script>
 <!-- IMPORT JSON MODAL -->
diff --git a/pages/update_data.php b/pages/update_data.php
index 6adc0c46..32a92afa 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -1228,6 +1228,15 @@ function formatVal($num){
 	return;
 }
 
+if($_GET['settings'] == 'prof'){
+	$value = mysqli_real_escape_string($conn, $_POST['value']);
+	$id = mysqli_real_escape_string($conn, $_POST['pk']);
+	$name = mysqli_real_escape_string($conn, $_POST['name']);
+
+	mysqli_query($conn, "UPDATE ingProfiles SET $name = '$value' WHERE id = '$id'");
+	return;
+}
+
 if($_GET['settings'] == 'fcat'){
 	$value = mysqli_real_escape_string($conn, $_POST['value']);
 	$cat_id = mysqli_real_escape_string($conn, $_POST['pk']);
diff --git a/pages/update_settings.php b/pages/update_settings.php
index 109a3b15..b81638db 100644
--- a/pages/update_settings.php
+++ b/pages/update_settings.php
@@ -248,6 +248,44 @@
 	return;
 }
 
+//ADD INGREDIENT PROFILE
+if($_POST['manage'] == 'add_ingprof'){
+	$profile = mysqli_real_escape_string($conn, $_POST['profile']);
+	$description = mysqli_real_escape_string($conn, $_POST['description']);
+	
+	if(empty($profile)){
+		$response["error"] = 'Profile name is required.';
+		echo json_encode($response);
+		return;
+	}
+	
+	if(mysqli_num_rows(mysqli_query($conn, "SELECT name FROM ingProfiles WHERE name = '$profile'"))){
+		$response["error"] = 'Profile name '.$profile.' already exists';
+		echo json_encode($response);
+		return;
+	}
+	if(mysqli_query($conn, "INSERT INTO ingProfiles (name,notes) VALUES ('$profile', '$description')")){
+		$response["success"] = 'Profile '.$profile.' added';
+		echo json_encode($response);
+	}else{
+		$response["error"] = 'Something went wrong, '.mysqli_error($conn);
+		echo json_encode($response);
+	}
+	return;
+}					
+
+//DELETE INGREDIENT PROFILE
+if($_POST['action'] == 'ingProfile' && $_POST['profId']){
+	$profId = mysqli_real_escape_string($conn, $_POST['profId']);
+	if(mysqli_query($conn, "DELETE FROM ingProfiles WHERE id = '$profId'")){
+		$response["success"] = 'Profile deleted';
+	}else{
+		$response["error"] = 'Error deleting profile';
+	}
+	echo json_encode($response);
+	return;
+}
+
 //ADD FORMULA CATEGORY
 if($_POST['manage'] == 'add_frmcategory'){
 	$cat = mysqli_real_escape_string($conn, $_POST['category']);
diff --git a/pages/views/settings/listIngProfiles.php b/pages/views/settings/listIngProfiles.php
new file mode 100644
index 00000000..198c1b0b
--- /dev/null
+++ b/pages/views/settings/listIngProfiles.php
@@ -0,0 +1,254 @@
+<?php 
+
+define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
+
+require_once(__ROOT__.'/inc/sec.php');
+require_once(__ROOT__.'/inc/opendb.php');
+?>
+<h3>Ingredient Profiles</h3>
+<hr>
+<div class="card-body">
+  <div class="text-right">
+    <div class="btn-group" id="menu">
+        <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
+        <div class="dropdown-menu">
+          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#add_ingredient_prof"><i class="fa-solid fa-plus mx-2"></i>Add ingredient profile</a></li>
+          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_profiles_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
+          <li><a class="dropdown-item" href="/pages/operations.php?action=exportIngProf"><i class="fa-solid fa-file-code mx-2"></i>Export as JSON</a></li>
+        </div>
+    </div>
+	</div>
+</div>
+    <div class="card-body">
+    <table id="ingDataProf" class="table table-striped" style="width:100%">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Description</th>
+          <th>Image</th>
+          <th></th>
+        </tr>
+      </thead>
+    </table>
+</div>
+ 
+<script>
+$(document).ready(function() {
+		var ingDataProf = $('#ingDataProf').DataTable( {
+		columnDefs: [
+			{ className: 'text-center', targets: '_all' },
+			{ orderable: false, targets: [2,3] }
+        ],
+		dom: 'lfrtip',
+		processing: true,
+        language: {
+			loadingRecords: '&nbsp;',
+			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw">',
+			emptyTable: 'No groups yet.',
+			search: 'Search:'
+		},
+    	ajax: {	url: '/core/list_ingProf_data.php' },
+		columns: [
+			{ data : 'name', title: 'Name', render: name },
+    		{ data : 'description', title: 'Description', render: description},
+    		{ data : 'image', title: 'Image', render: image},
+   			{ data : null, title: '', render: actions},		   
+		],
+        order: [[ 1, 'asc' ]],
+		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
+        pageLength: 20,
+		displayLength: 20,
+		stateSave: true,
+		stateDuration: -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listIngProf&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+				}
+			});
+		},
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			 url: "/core/update_user_settings.php?set=listIngProf&action=save",
+			 data: data,
+			 dataType: "json",
+			 type: "POST"
+		  });
+		},
+	});
+
+
+
+	function name(data, type, row){
+		return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
+	};
+	
+	function description(data, type, row){
+		return '<a class="notes pv_point_gen" data-name="notes" data-type="text" data-pk="'+row.id+'">'+row.notes+'</a>';    
+	};
+	
+	function image(data, type, row){
+		if(row.image){
+			var cimg = '<img src="' + row.image + '" class="img_ing">';
+		}else{
+			var cimg = '<img src="/img/molecule.png" class="img_ing">';
+		}
+		
+		return '<a href="#" data-id="'+row.id+'" data-bs-toggle="modal" data-bs-target="#editProfile">' + cimg + '</a>';    
+	};
+	
+	function actions(data, type, row){
+		return '<i id="profDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
+	};
+	
+
+	
+	$('#add-prof').click(function() {
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+				type: 'POST',
+				data: {
+					manage: 'add_ingprof',
+					profile: $("#profName").val(),
+					description: $("#description").val(),
+				},
+				dataType: 'json',
+				success: function (data) {
+					if ( data.success ) {
+						$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+						$('.toast-header').removeClass().addClass('toast-header alert-success');
+						reload_data();
+						$('#add_ingredient_prof').modal('toggle');
+						$('.toast').toast('show');
+					} else {
+						var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
+						$('#profMsgIn').html(msg);
+					}
+					
+				}
+			});
+	});
+	
+	
+	
+	$('#ingDataProf').editable({
+	  	container: 'body',
+	  	selector: 'a.name',
+	  	url: "/pages/update_data.php?settings=prof",
+	  	title: 'Profile name',
+	  	type: "POST",
+	  	dataType: 'json',
+	  	validate: function(value){
+	   		if($.trim(value) == ''){
+				return 'This field is required';
+	   		}
+	  	}
+	});
+	
+	$('#ingDataProf').editable({
+		container: 'body',
+	  	selector: 'a.notes',
+	  	url: "/pages/update_data.php?settings=prof",
+	  	title: 'Profile description',
+	  	type: "POST",
+	  	dataType: 'json',
+	  	validate: function(value){
+	   		if($.trim(value) == ''){
+				return 'This field is required';
+	   		}
+	  	}
+	});	
+		
+	$('#ingDataProf').on('click', '[id*=profDel]', function () {
+		var prof = {};
+		prof.ID = $(this).attr('data-id');
+		prof.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm profile deletion",
+		   message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> Profile?',
+		   buttons :{
+			   main: {
+				   label : "Delete",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_settings.php', 
+						type: 'POST',
+						data: {
+							action: "ingProfile",
+							profId: prof.ID,
+						},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mx-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
+						},
+						error: function (xhr, status, error) {
+							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							$('.toast').toast('show');
+						}
+					  });
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	function reload_data() {
+		$('#ingDataProf').DataTable().ajax.reload(null, true);
+	};
+
+});
+
+
+</script>
+<!--ADD PROFILE MODAL-->
+<div class="modal fade" id="add_ingredient_prof" data-bs-backdrop="static" tabindex="-1" aria-labelledby="add_ingredient_prof_label" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Add new profile</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      
+      <div class="modal-body">
+        <div id="profMsgIn"></div>
+        <div class="mb-3">
+          <label for="profName" class="form-label">Name</label>
+          <input name="profName" id="profName" type="text" class="form-control" />
+        </div>
+        <div class="mb-3">
+          <label for="description" class="form-label">Description</label>
+          <input name="description" id="description" type="text" class="form-control" />
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="close_prof">Close</button>
+        <button type="submit" name="add-prof" class="btn btn-primary" id="add-prof">Create</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+
diff --git a/releasenotes.md b/releasenotes.md
index 579ab29f..7fe42fef 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,6 @@
 Whats New in v11.0
 --------------------------
+- Making ingredient profile customizable
 - Added maximum allowed usage for a formula
 - Added a button to view ingredient data in PubChem
 - Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON

From 7736cbff61208c7bb89e052351273865189fdb3f Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 18:08:48 +0100
Subject: [PATCH 33/44] [a4f4449] - Making ingredient profile customizable

---
 pages/upload.php                         | 45 +++++++++++++++
 pages/{ => views/settings}/editCat.php   | 35 +-----------
 pages/views/settings/editProfile.php     | 71 ++++++++++++++++++++++++
 pages/views/settings/listCat.php         |  2 +-
 pages/views/settings/listIngProfiles.php | 27 ++++++++-
 5 files changed, 145 insertions(+), 35 deletions(-)
 rename pages/{ => views/settings}/editCat.php (58%)
 create mode 100644 pages/views/settings/editProfile.php

diff --git a/pages/upload.php b/pages/upload.php
index 5e79e67b..da0a2b91 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -9,6 +9,51 @@
 require_once(__ROOT__.'/func/formatBytes.php');
 require_once(__ROOT__.'/func/create_thumb.php');
 
+//UPLOAD ING PROFILE
+if($_GET['upload_ing_prof_pic'] && $_GET['profID']){
+
+	$id = (int)$_GET['profID'];
+	$allowed_ext = "png, jpg, jpeg, gif, bmp";
+
+	$filename = $_FILES["prof-pic-file"]["tmp_name"];  
+    $file_ext = strtolower(end(explode('.',$_FILES['prof-pic-file']['name'])));
+	$file_tmp = $_FILES['prof-pic-file']['tmp_name'];
+    $ext = explode(', ',strtolower($allowed_ext));
+
+	
+	if(!$filename){
+		$response["error"] = 'Please choose a file to upload...';
+		echo json_encode($response);
+		return;
+	}	
+	
+	if (!file_exists($tmp_path)) {
+		mkdir($tmp_path, 0740, true);
+	}
+		
+	if(in_array($file_ext,$ext)===false){
+		$response["error"] = 'Extension not allowed, please choose a '.$allowed_ext.' file';
+		echo json_encode($response);
+		return;
+	}
+		
+	if($_FILES["prof-pic-file"]["size"] > 0){
+		move_uploaded_file($file_tmp,$tmp_path.base64_encode($filename));
+		$pic = base64_encode($filename);		
+		create_thumb($tmp_path.$pic,250,250); 
+		$docData = 'data:application/' . $file_ext . ';base64,' . base64_encode(file_get_contents($tmp_path.$pic));
+		
+		if(mysqli_query($conn, "UPDATE ingProfiles SET image = '".$docData."' WHERE id = '$id'")){	
+			unlink($tmp_path.$pic);
+			$response["success"] = array( "msg" => "Profile image updated", "pic" => $docData);
+			echo json_encode($response);
+			return;
+		}
+	}
+
+	return;
+}
+
 if($_GET['upload_ing_cat_pic'] && $_GET['catID']){
 
 	$id = $_GET['catID'];
diff --git a/pages/editCat.php b/pages/views/settings/editCat.php
similarity index 58%
rename from pages/editCat.php
rename to pages/views/settings/editCat.php
index 29985580..15a5029b 100644
--- a/pages/editCat.php
+++ b/pages/views/settings/editCat.php
@@ -1,5 +1,5 @@
 <?php
-define('__ROOT__', dirname(dirname(__FILE__))); 
+define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
 
 require_once(__ROOT__.'/inc/sec.php');
 require_once(__ROOT__.'/inc/opendb.php');
@@ -11,37 +11,6 @@
 $max_height = 200;
 $max_width = 200;
 
-if(isset($_FILES['photo']['name'])){
-	$file_name = $_FILES['photo']['name'];
-    $file_size = $_FILES['photo']['size'];
-    $file_tmp =  $_FILES['photo']['tmp_name'];
-    $file_type = $_FILES['photo']['type'];
-    $file_ext = strtolower(end(explode('.',$_FILES['photo']['name'])));
-
-	
-	$tmp_path = __ROOT__.'/tmp/';
-	
-	if (!file_exists($tmp_path)) {
-		mkdir($tmp_path, 0740, true);
-	}
-	  
-    $ext = explode(', ',strtolower($allowed_ext));
-
-
- 	if(in_array($file_ext,$ext)=== false){
-		$msg = '<div class="alert alert-danger alert-dismissible"><strong>File upload error: </strong>Extension '.$file_ext.' not allowed, please choose a '.$allowed_ext.' file.</div>';
-    }elseif($file_size > $max_filesize){
-		$msg = '<div class="alert alert-danger alert-dismissible"><strong>File upload error: </strong>File size must not exceed '.formatBytes($max_filesize).'</div>';
-    }else{
-		imageResize($tmp_path, $file_tmp, $file_name, $max_height, $max_width);
-    	$data = 'data:image/' . $file_ext . ';base64,' . base64_encode(file_get_contents($tmp_path.$file_name));
-		if(mysqli_query($conn, "UPDATE ingCategory SET image = '".$data."' WHERE id = '$id'")or die(mysqli_error($conn))){
-			unlink($tmp_path.$file_name);
-			$msg = '<div class="alert alert-success alert-dismissible"><strong>File uploaded</div>';
-		}
-    }
-}
-
 $cat = mysqli_fetch_array(mysqli_query($conn, "SELECT image,name FROM ingCategory WHERE id = '$id'")); 
 
 ?>
@@ -90,7 +59,7 @@
 			success: function (data) {
 				if(data.success){
 					$('#cat-pic').html('<img class="img-profile-avatar" src="'+data.success.pic+'">');
-	
+					$('#tdDataCat').DataTable().ajax.reload(null, true);
 				}else if( data.error){
 					$('#cat-msg').html('<div class="alert alert-danger">'+data.error+'</div>');
 				}
diff --git a/pages/views/settings/editProfile.php b/pages/views/settings/editProfile.php
new file mode 100644
index 00000000..798fe2ee
--- /dev/null
+++ b/pages/views/settings/editProfile.php
@@ -0,0 +1,71 @@
+<?php
+define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
+
+require_once(__ROOT__.'/inc/sec.php');
+require_once(__ROOT__.'/inc/opendb.php');
+require_once(__ROOT__.'/func/formatBytes.php');
+require_once(__ROOT__.'/func/imageResize.php');
+
+$id = mysqli_real_escape_string($conn, $_GET['id']);
+$prof = mysqli_fetch_array(mysqli_query($conn, "SELECT image,name FROM ingProfiles WHERE id = '$id'")); 
+
+?>
+<div id="prof-msg"></div>
+
+
+	<div class="row">
+      <div class="col-md">
+        <div class="text-center">
+          <div id="prof-pic"><div class="loader"></div></div>
+          <h6>Upload a photo...</h6>
+          <input type="file" name="prof-pic-file" id="prof-pic-file" class="form-control">
+        </div>
+        <div class="dropdown-divider"></div>
+        <div class="col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
+			<div class="text-right mt-3 mb-3">
+        		<input type="submit" class="btn btn-primary" id="update-prof" value="Upload" />
+        	</div>
+        </div>
+      </div>
+    </div>
+    <div class="dropdown-divider"></div>
+    <div class="alert alert-info">Recommended size: 200x200 pixels</div>
+
+
+<script>
+$(document).ready(function () {
+
+	$('#prof-pic').html('<img class="img-profile-avatar" src="<?=$prof['image']?: '/img/molecule.png'; ?>">');
+	
+	$('#update-prof').click(function() {
+		var fd = new FormData();
+		var files = $('#prof-pic-file')[0].files;
+	
+		if(files.length > 0 ){
+			fd.append('prof-pic-file',files[0]);
+		}
+		$.ajax({ 
+			url: '/pages/upload.php?upload_ing_prof_pic=1&profID=<?=$id?>', 
+			type: 'POST',
+			data: fd,
+			contentType: false,
+			processData: false,
+			cache: false,
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					$('#prof-pic').html('<img class="img-profile-avatar" src="'+data.success.pic+'">');
+					$('#ingDataProf').DataTable().ajax.reload(null, true);
+				}else if( data.error){
+					$('#prof-msg').html('<div class="alert alert-danger">'+data.error+'</div>');
+				}
+			},
+			error: function (xhr, status, error) {
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				$('.toast').toast('show');
+			}
+		  });
+	});
+});
+</script>
\ No newline at end of file
diff --git a/pages/views/settings/listCat.php b/pages/views/settings/listCat.php
index 8df6a623..d5022ca0 100644
--- a/pages/views/settings/listCat.php
+++ b/pages/views/settings/listCat.php
@@ -254,7 +254,7 @@ function extrasShow() {
 		const id = e.relatedTarget.dataset.id;
 		const name = e.relatedTarget.dataset.name;
 	
-		$.get("/pages/editCat.php?id=" + id)
+		$.get("/pages/views/settings/editCat.php?id=" + id)
 			.then(data => {
 			$("#editCategoryLabel", this).html(name);
 			$(".modal-body", this).html(data);
diff --git a/pages/views/settings/listIngProfiles.php b/pages/views/settings/listIngProfiles.php
index 198c1b0b..eb439992 100644
--- a/pages/views/settings/listIngProfiles.php
+++ b/pages/views/settings/listIngProfiles.php
@@ -104,6 +104,16 @@ function actions(data, type, row){
 	};
 	
 
+	$("#editProfile").on("show.bs.modal", function(e) {
+		const id = e.relatedTarget.dataset.id;
+		const name = e.relatedTarget.dataset.name;
+	
+		$.get("/pages/views/settings/editProfile.php?id=" + id)
+			.then(data => {
+			$("#editProfileLabel", this).html(name);
+			$(".modal-body", this).html(data);
+		});
+	});
 	
 	$('#add-prof').click(function() {
 		$.ajax({ 
@@ -251,4 +261,19 @@ function reload_data() {
 </div>
 
 
-
+<!--EDIT MODAL-->            
+<div class="modal fade" id="editProfile" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="editProfileLabel" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title mgmIngHeader mgmIngHeader-with-separator" id="editProfileLabel">Edit profile</h5>
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-danger">Unable to get data</div>
+      </div>
+    </div>
+  </div>
+</div>

From d70f2d4f505b2b8f380be8ae274cdcf656d3e6da Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 18:18:47 +0100
Subject: [PATCH 34/44] [7736cbf] - Making ingredient profile customizable

---
 pages/operations.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pages/operations.php b/pages/operations.php
index e8ffbcbd..aacfb42d 100644
--- a/pages/operations.php
+++ b/pages/operations.php
@@ -1000,4 +1000,38 @@
 	return;
 }
 
+//EXPORT INGREDIENT PROFILES
+if($_GET['action'] == 'exportIngProf'){
+	if(empty(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingProfiles")))){
+		$msg['error'] = 'No data found to export.';
+		echo json_encode($msg);
+		return;
+	}
+	$data = 0;
+	$q = mysqli_query($conn, "SELECT * FROM ingProfiles");
+	while($resData = mysqli_fetch_assoc($q)){
+		
+		$r['id'] = (int)$resData['id'];
+		$r['name'] = (string)$resData['name']?: "-";
+		$r['notes'] = (string)$resData['notes']?: "-";
+		$r['image'] = (string)$resData['image'] ?: "-";
+		
+		$data++;
+		$cat[] = $r;
+	}
+	
+	$vd['product'] = $product;
+	$vd['version'] = $ver;
+	$vd['ingCategory'] = $data;
+	$vd['timestamp'] = date('d/m/Y H:i:s');
+
+	
+	$result['ingProfiles'] = $cat;
+	$result['pvMeta'] = $vd;
+	
+	header('Content-disposition: attachment; filename=IngProfiles.json');
+	header('Content-type: application/json');
+	echo json_encode($result, JSON_PRETTY_PRINT);
+	return;
+}
 ?>

From 2dfb52c6ffab1c664446ad2b01f6ba1b71e6e84c Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 18:21:29 +0100
Subject: [PATCH 35/44] [d70f2d4] - Code clean-up

---
 pages/views/settings/listFrmCat.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/views/settings/listFrmCat.php b/pages/views/settings/listFrmCat.php
index ced5a720..193fc018 100644
--- a/pages/views/settings/listFrmCat.php
+++ b/pages/views/settings/listFrmCat.php
@@ -35,7 +35,7 @@
  
 <script>
 $(document).ready(function() {
-		var frmDataCat = $('#frmDataCat').DataTable( {
+	var frmDataCat = $('#frmDataCat').DataTable( {
 		columnDefs: [
 			{ className: 'text-center', targets: '_all' },
 			{ orderable: false, targets: [2,3] }
@@ -47,14 +47,14 @@
 			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw">',
 			emptyTable: 'No groups yet.',
 			search: 'Search:'
-			},
+		},
     	ajax: {	url: '/core/list_frmCat_data.php' },
 		columns: [
-				  { data : 'name', title: 'Name', render: cName },
-    			  { data : 'type', title: 'Type', render: cType},
-    			  { data : 'colorKey', title: 'Colour Key', render: fKey},
-   				  { data : null, title: '', render: cActions},		   
-				 ],
+			{ data : 'name', title: 'Name', render: cName },
+    		{ data : 'type', title: 'Type', render: cType},
+    		{ data : 'colorKey', title: 'Colour Key', render: fKey},
+   			{ data : null, title: '', render: cActions},		   
+		],
         order: [[ 1, 'asc' ]],
 		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
         pageLength: 20,
@@ -84,19 +84,19 @@
 
 	function cName(data, type, row){
 		return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
-	}
+	};
 	
 	function cType(data, type, row){
 		return '<a class="type pv_point_gen" data-name="type" data-type="select" data-pk="'+row.id+'">'+row.type+'</a>';    
-	}
+	};
 	
 	function cActions(data, type, row){
 		return '<i id="catDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
-	}
+	};
 	
 	function fKey(data, type, row){
 		return '<a href="#" class="colorKey" style="background-color: '+row.colorKey+'" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';    
-	}
+	};
 	
 	$('#add-fcat').click(function() {
 	$.ajax({ 

From 9c40f4f2f8840008fcfe6a429d75d54235b6f3c0 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 18:22:10 +0100
Subject: [PATCH 36/44] [2dfb52c] - Code clean-up

---
 pages/views/settings/listCat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/views/settings/listCat.php b/pages/views/settings/listCat.php
index d5022ca0..f8dc5d9c 100644
--- a/pages/views/settings/listCat.php
+++ b/pages/views/settings/listCat.php
@@ -38,7 +38,7 @@
                 
 <script>
 $(document).ready(function() {
-		var tdDataCat = $('#tdDataCat').DataTable( {
+	var tdDataCat = $('#tdDataCat').DataTable( {
 		columnDefs: [
 			{ className: 'text-center', targets: '_all' },
 			{ orderable: false, targets: [0,1,4] }
@@ -96,7 +96,7 @@ function ciImage(data, type, row){
 		}
 		
 		return '<a href="#" data-id="'+row.id+'" data-bs-toggle="modal" data-bs-target="#editCategory">' + cimg + '</a>';    
-	}
+	};
 	
 	function ciKey(data, type, row){
 		return '<a href="#" class="colorKey" style="background-color: rgb('+row.colorKey+')" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';

From 1c43e0687f7e946e42cf30f664c2133131751dbb Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 18:34:34 +0100
Subject: [PATCH 37/44] [9c40f4f] - Making ingredient profile customizable

---
 js/import.categories.js                  |  2 +-
 pages/operations.php                     | 15 ++++++++++++++-
 pages/views/settings/listIngProfiles.php |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/js/import.categories.js b/js/import.categories.js
index f75c9ed7..400b178c 100644
--- a/js/import.categories.js
+++ b/js/import.categories.js
@@ -94,7 +94,7 @@ $('#btnRestoreCategories').click(function() {
 				$("#btnRestoreCategories").hide();
 				$("#backupArea").css('display', 'none');
 				//reload_data();
-				$('#tdDataCat, #frmDataCat').DataTable().ajax.reload(null, true);
+				$('#tdDataCat, #frmDataCat, #ingDataProf').DataTable().ajax.reload(null, true);
 			}else if(data.error){
 				var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
 				$("#btnRestoreCategories").show();
diff --git a/pages/operations.php b/pages/operations.php
index aacfb42d..465b07cd 100644
--- a/pages/operations.php
+++ b/pages/operations.php
@@ -645,7 +645,7 @@
     if (move_uploaded_file($_FILES['jsonFile']['tmp_name'], $target_path)) {
         $data = json_decode(file_get_contents($target_path), true);
 
-        if (!$data['ingCategory'] && !$data['formulaCategories']) {
+        if (!$data['ingCategory'] && !$data['formulaCategories'] && !$data['ingProfiles']) {
             $result['error'] = "JSON File seems invalid. Please make sure you are importing the right file";
             echo json_encode($result);
             return;
@@ -680,6 +680,19 @@
             }
             $stmt->close();
         }
+		
+		if ($data['ingProfiles']) {
+            $stmt = $conn->prepare("INSERT INTO `ingProfiles` (`name`, `notes`, `image`) VALUES (?, ?, ?)");
+            foreach ($data['ingProfiles'] as $d) {
+                $stmt->bind_param("sss", $d['name'], $d['notes'], $d['image']);
+                if (!$stmt->execute()) {
+                    $success = false;
+                    $result['error'] = "Error inserting into ingProfiles: " . $stmt->error;
+                    break;
+                }
+            }
+            $stmt->close();
+        }
 
         if ($success) {
             $conn->commit(); // Commit the transaction
diff --git a/pages/views/settings/listIngProfiles.php b/pages/views/settings/listIngProfiles.php
index eb439992..04703e89 100644
--- a/pages/views/settings/listIngProfiles.php
+++ b/pages/views/settings/listIngProfiles.php
@@ -13,7 +13,7 @@
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
         <div class="dropdown-menu">
           <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#add_ingredient_prof"><i class="fa-solid fa-plus mx-2"></i>Add ingredient profile</a></li>
-          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_profiles_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
+          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_categories_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
           <li><a class="dropdown-item" href="/pages/operations.php?action=exportIngProf"><i class="fa-solid fa-file-code mx-2"></i>Export as JSON</a></li>
         </div>
     </div>

From 46d81431afa831d6470c123a4b0f181e5830aaf4 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 21:02:03 +0100
Subject: [PATCH 38/44] [1c43e06] - Text class added for max_usage

---
 pages/formula.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/formula.php b/pages/formula.php
index 8af721ad..8f32004a 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -73,7 +73,7 @@
                         <a href="#" rel="tip" class="text-secondary-emphasis" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
                           <?= ucfirst($meta['catClass']) ?>
                         </a>
-                        <div id="max_usage"></div>
+                        <div id="max_usage" class="text-secondary-emphasis"></div>
                       </span>
                     </h5>
                   </div>

From 734bc5c4762ddb84b9c99acfc0573b8653ed9e7c Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 21:04:29 +0100
Subject: [PATCH 39/44] [46d8143] - Error handling

---
 pages/formula.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pages/formula.php b/pages/formula.php
index 8f32004a..efbbd754 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -296,6 +296,11 @@
 				$('.toast-header').removeClass().addClass('toast-header alert-danger');
 			}
 			$('.toast').toast('show');
+		},
+		error: function (xhr, status, error) {
+			$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+			$('.toast-header').removeClass().addClass('toast-header alert-danger');
+			$('.toast').toast('show');
 		}
 		
 	  });
@@ -323,6 +328,11 @@ function setProtected(status) {
 				}
 			} else {
 				$('#msgInfo').html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>' + data.error + '</strong></div>');
+			},
+			error: function (xhr, status, error) {
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				$('.toast').toast('show');
 			}
 		}
 	  });

From d0dc37508b80f1dffd68a6991af48dd10cb9364b Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 21:05:40 +0100
Subject: [PATCH 40/44] [734bc5c] - Error handling

---
 pages/viewFormula.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 45a708be..1981e1de 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -390,7 +390,12 @@ className : "btn-danger",
 							$('.toast-header').removeClass().addClass('toast-header alert-danger');
 						}
 						$('.toast').toast('show');
-					}						
+					},
+					error: function (xhr, status, error) {
+						$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
+						$('.toast-header').removeClass().addClass('toast-header alert-danger');
+						$('.toast').toast('show');
+					}
 				  });
                  return false;
                }

From f6cc4467d0bfb7d1b6a0dac2f9dcb7dc9c4f3d69 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 21:13:23 +0100
Subject: [PATCH 41/44] [d0dc375] - Error handling

---
 pages/formula.php     | 57 ++++++++++++++++++++++---------------------
 pages/viewFormula.php |  8 +++---
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/pages/formula.php b/pages/formula.php
index efbbd754..db9f7a72 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -309,34 +309,35 @@
 
 function setProtected(status) {
   $.ajax({ 
-		url: '/pages/update_data.php', 
-		type: 'GET',
-		data: {
-			protect: myFID,
-			isProtected: status,
-			},
-		dataType: 'json',
-		success: function (data) {
-			if ( data.success ) {
-				fetch_formula();
-				if( data.success == 'Formula locked'){
-					$('#lock_status').html('<a class="fas fa-lock text-body-emphasis" href="javascript:setProtected(\'false\')">');
-					$('#add_ing').hide();
-				}else{
-					$('#lock_status').html('<a class="fas fa-unlock text-body-emphasis" href="javascript:setProtected(\'true\')">');
-					$('#add_ing').show();
-				}
-			} else {
-				$('#msgInfo').html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>' + data.error + '</strong></div>');
-			},
-			error: function (xhr, status, error) {
-				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
-				$('.toast-header').removeClass().addClass('toast-header alert-danger');
-				$('.toast').toast('show');
-			}
-		}
-	  });
-};
+    url: '/pages/update_data.php', 
+    type: 'GET',
+    data: {
+      protect: myFID,
+      isProtected: status,
+    },
+    dataType: 'json',
+    success: function (data) {
+      if (data.success) {
+        fetch_formula();
+        if (data.success === 'Formula locked') {
+          $('#lock_status').html('<a class="fas fa-lock text-body-emphasis" href="javascript:setProtected(\'false\')"></a>');
+          $('#add_ing').hide();
+        } else {
+          $('#lock_status').html('<a class="fas fa-unlock text-body-emphasis" href="javascript:setProtected(\'true\')"></a>');
+          $('#add_ing').show();
+        }
+      } else {
+        $('#msgInfo').html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>' + data.error + '</strong></div>');
+      }
+    },
+    error: function (xhr, status, error) {
+      $('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. ' + error);
+      $('.toast-header').removeClass().addClass('toast-header alert-danger');
+      $('.toast').toast('show');
+    }
+  });
+}
+
 
 function fetch_formula(){
 $.ajax({ 
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 1981e1de..3b7be019 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -385,17 +385,17 @@ className : "btn-danger",
 							$('.toast-header').removeClass().addClass('toast-header alert-success');
 							reload_formula_data();
 							bootbox.hideAll();
+							$('.toast').toast('show');
 						}else{
-            				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+            				$('#err').html('<div class="alert alert-danger"><strong>' + data.error + '</strong></div>');
 						}
-						$('.toast').toast('show');
+						
 					},
 					error: function (xhr, status, error) {
 						$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
 						$('.toast-header').removeClass().addClass('toast-header alert-danger');
 						$('.toast').toast('show');
-					}
+					},
 				  });
                  return false;
                }

From 7bccc90c2d636398cabf09abb3ea8cb5c9e1d410 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Thu, 22 Aug 2024 21:20:58 +0100
Subject: [PATCH 42/44] [f6cc446] - Making ingredient profile customizable

---
 css/vault.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/css/vault.css b/css/vault.css
index e9ef7413..1247516c 100755
--- a/css/vault.css
+++ b/css/vault.css
@@ -174,6 +174,15 @@ a {
 	font-weight: bold;
 }
 
+.custom_profile_notes {
+	background-size: 30px 30px;
+	background-repeat:no-repeat;
+	display: inline-block;
+	height: 30px;
+	content:"";
+	font-weight: bold;
+}
+
 .img-formula {
 	height: 60px;
 	float: right;

From 97a75fab080739a1a967a5b45ba54da598bc40f4 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Fri, 23 Aug 2024 08:58:24 +0100
Subject: [PATCH 43/44] [7bccc90] - Making ingredient profile customizable
 (Revert)

---
 core/list_ingProf_data.php               |  24 --
 db/pvault.sql                            |   3 +-
 db/updates/update_10.9-11.0.sql          |   1 -
 js/import.categories.js                  |   2 +-
 js/settings.tabs.js                      |  14 +-
 pages/settings.php                       |  10 +-
 pages/views/settings/editProfile.php     |  71 ------
 pages/views/settings/listIngProfiles.php | 279 -----------------------
 8 files changed, 4 insertions(+), 400 deletions(-)
 delete mode 100644 core/list_ingProf_data.php
 delete mode 100644 db/updates/update_10.9-11.0.sql
 delete mode 100644 pages/views/settings/editProfile.php
 delete mode 100644 pages/views/settings/listIngProfiles.php

diff --git a/core/list_ingProf_data.php b/core/list_ingProf_data.php
deleted file mode 100644
index 34f3a252..00000000
--- a/core/list_ingProf_data.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-define('__ROOT__', dirname(__DIR__));
-
-require_once(__ROOT__ . '/inc/sec.php');
-require_once(__ROOT__ . '/inc/opendb.php');
-
-$response = ['data' => []];
-
-$cat_q = mysqli_query($conn, "SELECT id, name, notes, image FROM ingProfiles");
-
-if ($cat_q) {
-    while ($profs_res = mysqli_fetch_assoc($cat_q)) {
-        $response['data'][] = [
-            'id' => (int)$profs_res['id'],
-            'name' => (string)$profs_res['name'],
-            'notes' => (string)$profs_res['notes'] ?: 'N/A',
-            'image' => (string)$profs_res['image'] ?: null,
-        ];
-    }
-}
-
-header('Content-Type: application/json; charset=utf-8');
-echo json_encode($response);
-
diff --git a/db/pvault.sql b/db/pvault.sql
index 8f4b5af1..f0b83d99 100755
--- a/db/pvault.sql
+++ b/db/pvault.sql
@@ -172,8 +172,7 @@ CREATE TABLE `ingCategory` (
 CREATE TABLE `ingProfiles` (
   `id` int(11) NOT NULL,
   `name` varchar(255) COLLATE utf8_general_ci NOT NULL,
-  `notes` text COLLATE utf8_general_ci DEFAULT NULL,
-  `image` LONGBLOB NULL
+  `notes` text COLLATE utf8_general_ci DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `ingProfiles` (`id`, `name`, `notes`) VALUES
diff --git a/db/updates/update_10.9-11.0.sql b/db/updates/update_10.9-11.0.sql
deleted file mode 100644
index 4c767d7f..00000000
--- a/db/updates/update_10.9-11.0.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `ingProfiles` ADD `image` LONGBLOB NOT NULL AFTER `notes`; 
\ No newline at end of file
diff --git a/js/import.categories.js b/js/import.categories.js
index 400b178c..f75c9ed7 100644
--- a/js/import.categories.js
+++ b/js/import.categories.js
@@ -94,7 +94,7 @@ $('#btnRestoreCategories').click(function() {
 				$("#btnRestoreCategories").hide();
 				$("#backupArea").css('display', 'none');
 				//reload_data();
-				$('#tdDataCat, #frmDataCat, #ingDataProf').DataTable().ajax.reload(null, true);
+				$('#tdDataCat, #frmDataCat').DataTable().ajax.reload(null, true);
 			}else if(data.error){
 				var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
 				$("#btnRestoreCategories").show();
diff --git a/js/settings.tabs.js b/js/settings.tabs.js
index 3daec3ce..4a64df27 100644
--- a/js/settings.tabs.js
+++ b/js/settings.tabs.js
@@ -12,9 +12,7 @@ $(document).ready(function() {
 	$('#cat_tab').on( 'click', function () {
 		list_cat();
 	});
-	$('#prof_tab').on( 'click', function () {
-		list_prof();
-	})	
+		
 	$('#frmCat_tab').on( 'click', function () {
 		list_fcat();
 	});
@@ -73,16 +71,6 @@ $(document).ready(function() {
 		});
 	};
 	
-	function list_prof(){
-		$.ajax({ 
-			url: '/pages/views/settings/listIngProfiles.php', 
-			dataType: 'html',
-			success: function (data) {
-				$('#list_prof').html(data);
-			}
-		});
-	};
-	
 	function list_fcat(){
 		$.ajax({ 
 			url: '/pages/views/settings/listFrmCat.php', 
diff --git a/pages/settings.php b/pages/settings.php
index 622d3fe8..e574e540 100755
--- a/pages/settings.php
+++ b/pages/settings.php
@@ -12,7 +12,6 @@
      <ul>
          <li class="active"><a href="#general" id="general_tab" role="tab" data-bs-toggle="tab">General</a></li>
          <li><a href="#categories" id="cat_tab" role="tab" data-bs-toggle="tab">Ingredient Categories</a></li>
-         <li><a href="#profiles" id="prof_tab" role="tab" data-bs-toggle="tab">Ingredient Profiles</a></li>
          <li><a href="#frmCat" id="frmCat_tab" role="tab" data-bs-toggle="tab">Formula Categories</a></li>
          <li><a href="#perfumeTypes" id="perfume_types_tab" role="tab" data-bs-toggle="tab">Perfume Types</a></li>
          <li><a href="#templates" id="templates_tab" role="tab" data-bs-toggle="tab">HTML Templates</a></li>
@@ -44,14 +43,7 @@
             </div>
         </div>
      </div> 
-     <div id="profiles">
-        <div id="list_prof">
-            <div class="loader-center">
-                <div class="loader"></div>
-                <div class="loader-text"></div>
-            </div>
-        </div>
-     </div>      
+      
      <div id="frmCat">
     	<div id="fcatMsg"></div>
         <div id="list_fcat">
diff --git a/pages/views/settings/editProfile.php b/pages/views/settings/editProfile.php
deleted file mode 100644
index 798fe2ee..00000000
--- a/pages/views/settings/editProfile.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
-
-require_once(__ROOT__.'/inc/sec.php');
-require_once(__ROOT__.'/inc/opendb.php');
-require_once(__ROOT__.'/func/formatBytes.php');
-require_once(__ROOT__.'/func/imageResize.php');
-
-$id = mysqli_real_escape_string($conn, $_GET['id']);
-$prof = mysqli_fetch_array(mysqli_query($conn, "SELECT image,name FROM ingProfiles WHERE id = '$id'")); 
-
-?>
-<div id="prof-msg"></div>
-
-
-	<div class="row">
-      <div class="col-md">
-        <div class="text-center">
-          <div id="prof-pic"><div class="loader"></div></div>
-          <h6>Upload a photo...</h6>
-          <input type="file" name="prof-pic-file" id="prof-pic-file" class="form-control">
-        </div>
-        <div class="dropdown-divider"></div>
-        <div class="col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
-			<div class="text-right mt-3 mb-3">
-        		<input type="submit" class="btn btn-primary" id="update-prof" value="Upload" />
-        	</div>
-        </div>
-      </div>
-    </div>
-    <div class="dropdown-divider"></div>
-    <div class="alert alert-info">Recommended size: 200x200 pixels</div>
-
-
-<script>
-$(document).ready(function () {
-
-	$('#prof-pic').html('<img class="img-profile-avatar" src="<?=$prof['image']?: '/img/molecule.png'; ?>">');
-	
-	$('#update-prof').click(function() {
-		var fd = new FormData();
-		var files = $('#prof-pic-file')[0].files;
-	
-		if(files.length > 0 ){
-			fd.append('prof-pic-file',files[0]);
-		}
-		$.ajax({ 
-			url: '/pages/upload.php?upload_ing_prof_pic=1&profID=<?=$id?>', 
-			type: 'POST',
-			data: fd,
-			contentType: false,
-			processData: false,
-			cache: false,
-			dataType: 'json',
-			success: function (data) {
-				if(data.success){
-					$('#prof-pic').html('<img class="img-profile-avatar" src="'+data.success.pic+'">');
-					$('#ingDataProf').DataTable().ajax.reload(null, true);
-				}else if( data.error){
-					$('#prof-msg').html('<div class="alert alert-danger">'+data.error+'</div>');
-				}
-			},
-			error: function (xhr, status, error) {
-				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
-				$('.toast-header').removeClass().addClass('toast-header alert-danger');
-				$('.toast').toast('show');
-			}
-		  });
-	});
-});
-</script>
\ No newline at end of file
diff --git a/pages/views/settings/listIngProfiles.php b/pages/views/settings/listIngProfiles.php
deleted file mode 100644
index 04703e89..00000000
--- a/pages/views/settings/listIngProfiles.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php 
-
-define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
-
-require_once(__ROOT__.'/inc/sec.php');
-require_once(__ROOT__.'/inc/opendb.php');
-?>
-<h3>Ingredient Profiles</h3>
-<hr>
-<div class="card-body">
-  <div class="text-right">
-    <div class="btn-group" id="menu">
-        <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
-        <div class="dropdown-menu">
-          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#add_ingredient_prof"><i class="fa-solid fa-plus mx-2"></i>Add ingredient profile</a></li>
-          <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_categories_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
-          <li><a class="dropdown-item" href="/pages/operations.php?action=exportIngProf"><i class="fa-solid fa-file-code mx-2"></i>Export as JSON</a></li>
-        </div>
-    </div>
-	</div>
-</div>
-    <div class="card-body">
-    <table id="ingDataProf" class="table table-striped" style="width:100%">
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-          <th>Image</th>
-          <th></th>
-        </tr>
-      </thead>
-    </table>
-</div>
- 
-<script>
-$(document).ready(function() {
-		var ingDataProf = $('#ingDataProf').DataTable( {
-		columnDefs: [
-			{ className: 'text-center', targets: '_all' },
-			{ orderable: false, targets: [2,3] }
-        ],
-		dom: 'lfrtip',
-		processing: true,
-        language: {
-			loadingRecords: '&nbsp;',
-			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw">',
-			emptyTable: 'No groups yet.',
-			search: 'Search:'
-		},
-    	ajax: {	url: '/core/list_ingProf_data.php' },
-		columns: [
-			{ data : 'name', title: 'Name', render: name },
-    		{ data : 'description', title: 'Description', render: description},
-    		{ data : 'image', title: 'Image', render: image},
-   			{ data : null, title: '', render: actions},		   
-		],
-        order: [[ 1, 'asc' ]],
-		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
-        pageLength: 20,
-		displayLength: 20,
-		stateSave: true,
-		stateDuration: -1,
-		stateLoadCallback: function (settings, callback) {
-			$.ajax( {
-				url: '/core/update_user_settings.php?set=listIngProf&action=load',
-				dataType: 'json',
-				success: function (json) {
-					callback( json );
-				}
-			});
-		},
-		stateSaveCallback: function (settings, data) {
-		   $.ajax({
-			 url: "/core/update_user_settings.php?set=listIngProf&action=save",
-			 data: data,
-			 dataType: "json",
-			 type: "POST"
-		  });
-		},
-	});
-
-
-
-	function name(data, type, row){
-		return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
-	};
-	
-	function description(data, type, row){
-		return '<a class="notes pv_point_gen" data-name="notes" data-type="text" data-pk="'+row.id+'">'+row.notes+'</a>';    
-	};
-	
-	function image(data, type, row){
-		if(row.image){
-			var cimg = '<img src="' + row.image + '" class="img_ing">';
-		}else{
-			var cimg = '<img src="/img/molecule.png" class="img_ing">';
-		}
-		
-		return '<a href="#" data-id="'+row.id+'" data-bs-toggle="modal" data-bs-target="#editProfile">' + cimg + '</a>';    
-	};
-	
-	function actions(data, type, row){
-		return '<i id="profDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
-	};
-	
-
-	$("#editProfile").on("show.bs.modal", function(e) {
-		const id = e.relatedTarget.dataset.id;
-		const name = e.relatedTarget.dataset.name;
-	
-		$.get("/pages/views/settings/editProfile.php?id=" + id)
-			.then(data => {
-			$("#editProfileLabel", this).html(name);
-			$(".modal-body", this).html(data);
-		});
-	});
-	
-	$('#add-prof').click(function() {
-		$.ajax({ 
-			url: '/pages/update_settings.php', 
-				type: 'POST',
-				data: {
-					manage: 'add_ingprof',
-					profile: $("#profName").val(),
-					description: $("#description").val(),
-				},
-				dataType: 'json',
-				success: function (data) {
-					if ( data.success ) {
-						$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-						$('.toast-header').removeClass().addClass('toast-header alert-success');
-						reload_data();
-						$('#add_ingredient_prof').modal('toggle');
-						$('.toast').toast('show');
-					} else {
-						var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
-						$('#profMsgIn').html(msg);
-					}
-					
-				}
-			});
-	});
-	
-	
-	
-	$('#ingDataProf').editable({
-	  	container: 'body',
-	  	selector: 'a.name',
-	  	url: "/pages/update_data.php?settings=prof",
-	  	title: 'Profile name',
-	  	type: "POST",
-	  	dataType: 'json',
-	  	validate: function(value){
-	   		if($.trim(value) == ''){
-				return 'This field is required';
-	   		}
-	  	}
-	});
-	
-	$('#ingDataProf').editable({
-		container: 'body',
-	  	selector: 'a.notes',
-	  	url: "/pages/update_data.php?settings=prof",
-	  	title: 'Profile description',
-	  	type: "POST",
-	  	dataType: 'json',
-	  	validate: function(value){
-	   		if($.trim(value) == ''){
-				return 'This field is required';
-	   		}
-	  	}
-	});	
-		
-	$('#ingDataProf').on('click', '[id*=profDel]', function () {
-		var prof = {};
-		prof.ID = $(this).attr('data-id');
-		prof.Name = $(this).attr('data-name');
-		
-		bootbox.dialog({
-		   title: "Confirm profile deletion",
-		   message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> Profile?',
-		   buttons :{
-			   main: {
-				   label : "Delete",
-				   className : "btn-danger",
-				   callback: function (){
-						
-					$.ajax({ 
-						url: '/pages/update_settings.php', 
-						type: 'POST',
-						data: {
-							action: "ingProfile",
-							profId: prof.ID,
-						},
-						dataType: 'json',
-						success: function (data) {
-							if ( data.success ) {
-								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-								$('.toast-header').removeClass().addClass('toast-header alert-success');
-								reload_data();
-							} else {
-								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mx-2"></i>' + data.error);
-								$('.toast-header').removeClass().addClass('toast-header alert-danger');
-							}
-							$('.toast').toast('show');
-						},
-						error: function (xhr, status, error) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i> An ' + status + ' occurred, check server logs for more info. '+ error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
-							$('.toast').toast('show');
-						}
-					  });
-					 return true;
-				   }
-			   },
-			   cancel: {
-				   label : "Cancel",
-				   className : "btn-secondary",
-				   callback : function() {
-					   return true;
-				   }
-			   }   
-		   },onEscape: function () {return true;}
-	   });
-	});
-	
-	function reload_data() {
-		$('#ingDataProf').DataTable().ajax.reload(null, true);
-	};
-
-});
-
-
-</script>
-<!--ADD PROFILE MODAL-->
-<div class="modal fade" id="add_ingredient_prof" data-bs-backdrop="static" tabindex="-1" aria-labelledby="add_ingredient_prof_label" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Add new profile</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      
-      <div class="modal-body">
-        <div id="profMsgIn"></div>
-        <div class="mb-3">
-          <label for="profName" class="form-label">Name</label>
-          <input name="profName" id="profName" type="text" class="form-control" />
-        </div>
-        <div class="mb-3">
-          <label for="description" class="form-label">Description</label>
-          <input name="description" id="description" type="text" class="form-control" />
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="close_prof">Close</button>
-        <button type="submit" name="add-prof" class="btn btn-primary" id="add-prof">Create</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<!--EDIT MODAL-->            
-<div class="modal fade" id="editProfile" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="editProfileLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title mgmIngHeader mgmIngHeader-with-separator" id="editProfileLabel">Edit profile</h5>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <div class="alert alert-danger">Unable to get data</div>
-      </div>
-    </div>
-  </div>
-</div>

From 5d0754dc8ef2d206299086cfa26b328d63408f89 Mon Sep 17 00:00:00 2001
From: JB <john@globaldyne.co.uk>
Date: Fri, 23 Aug 2024 10:14:34 +0100
Subject: [PATCH 44/44] [97a75fa] - Making ingredient profile customizable
 (Revert)

---
 CHANGELOG.md    | 1 -
 releasenotes.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf22968c..6c5436df 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # CHANGELOG
 ### Version 11.0
-- Making ingredient profile customizable
 - Making SDS GA
 - Added maximum allowed usage for a formula
 - Changed datatype for PubChem to json
diff --git a/releasenotes.md b/releasenotes.md
index 7fe42fef..579ab29f 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,6 +1,5 @@
 Whats New in v11.0
 --------------------------
-- Making ingredient profile customizable
 - Added maximum allowed usage for a formula
 - Added a button to view ingredient data in PubChem
 - Changed the way the ingredient is handled when exists in a formula but not in the database. Instead of auto creating it when clicked, it presents options to create it, search in PV Online or import via JSON