From b4dec7b042e4acb91da44f21ef4c4e98c316f734 Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 9 Aug 2024 19:15:29 +0100 Subject: [PATCH 01/39] - v10.9 --- CHANGELOG.md | 2 ++ VERSION.md | 2 +- db/schema.ver | 2 +- releasenotes.md | 10 +--------- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a183c14e..df9b4839 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # CHANGELOG +### Version 10.9 + ### Version 10.8 - Fix API key update not returning error in correct format - Rewrite API page diff --git a/VERSION.md b/VERSION.md index f5d39891..73def33c 100755 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -10.8 +10.9 diff --git a/db/schema.ver b/db/schema.ver index f5d39891..73def33c 100644 --- a/db/schema.ver +++ b/db/schema.ver @@ -1 +1 @@ -10.8 +10.9 diff --git a/releasenotes.md b/releasenotes.md index 4941034a..17d4bcae 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,11 +1,3 @@ -Whats New in v10.8 +Whats New in v10.9 -------------------------- -- This release also contains various UI and backend minor improvements -- Added support for a dark theme -- Complete rewrite for Finished Product page -- Added a font size when exporting a PDF in Sell Formula -- Added brand logo when exporting a PDF in Sell Formula -- Added opacity for watermak in Sell Formula page -- Replaced PDF export in Sell Formula with the native DataTables function -- Under the hood improvements for Finished Product page - This release may include more changes, for full details please refer to the CHANGELOG From 0ef67fc1827d55eaa00ef35cbf0f82d083c4ea51 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 11:10:31 +0100 Subject: [PATCH 02/39] - Fix materials not updating corrrectly when added in the cart - Added CSV export for cart ingredients - Added a toast message for the cart actions - Added a toast message when adding an ingredient to the cart in Make Formula - CSS clean-up --- CHANGELOG.md | 5 +++++ LIMITATIONS.md | 2 +- css/sb-admin-2.css | 1 - js/makeFormula.js | 12 +++++++----- pages/cart.php | 41 +++++++++++++++++++++++++++++++++-------- pages/manageFormula.php | 5 ++++- pages/top.php | 9 ++++----- releasenotes.md | 2 ++ 8 files changed, 56 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df9b4839..868d631b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG ### Version 10.9 +- Fix materials not updating corrrectly when added in the cart +- Added CSV export for cart ingredients +- Added a toast message for the cart actions +- Added a toast message when adding an ingredient to the cart in Make Formula +- CSS clean-up ### Version 10.8 - Fix API key update not returning error in correct format diff --git a/LIMITATIONS.md b/LIMITATIONS.md index 826e4abc..85f90c2a 100644 --- a/LIMITATIONS.md +++ b/LIMITATIONS.md @@ -1,4 +1,4 @@ #Limitations - No support for enviroments like XAMPP -- Own vhost is required if run outide docker \ No newline at end of file +- Own vhost is required if run outside docker \ No newline at end of file diff --git a/css/sb-admin-2.css b/css/sb-admin-2.css index 7e506ef5..3e094249 100755 --- a/css/sb-admin-2.css +++ b/css/sb-admin-2.css @@ -9597,7 +9597,6 @@ a:focus { } .bg-gradient-primary { - background-color: #4e73df; background-image: linear-gradient(180deg, #4e73df 10%, #224abe 100%); background-size: cover; } diff --git a/js/makeFormula.js b/js/makeFormula.js index cdf9c078..3d9017b0 100644 --- a/js/makeFormula.js +++ b/js/makeFormula.js @@ -295,13 +295,15 @@ function formatSuppliersSelection (supplierData) { }, dataType: 'json', success: function (data) { - if(data.success) { - var msg = '
x' + data.success + '
'; + if(data.success){ + $('#toast-title').html('' + data.success); + $('.toast-header').removeClass().addClass('toast-header alert-success'); reload_data(); - } else { - var msg = '
x' + data.error + '
'; + }else if(data.error){ + $('#toast-title').html('' + data.error); + $('.toast-header').removeClass().addClass('toast-header alert-danger'); } - $('#msg').html(msg); + $('.toast').toast('show'); } }); }); diff --git a/pages/cart.php b/pages/cart.php index 95cf5cdd..92668538 100644 --- a/pages/cart.php +++ b/pages/cart.php @@ -9,6 +9,14 @@
+
+ +
@@ -45,6 +53,15 @@ search: 'Quick Search:', searchPlaceholder: 'Name..', }, + buttons: [{ + extend: "csv", + filename: "Cart ingredients", + exportOptions: { + columns: [0, 1, 2], + stripHtml: true, + orthogonal: 'export' + } + }], ajax: { url: '/core/cart_data.php', type: 'POST', @@ -61,7 +78,7 @@ { data : 'purity', title: 'Purity (%)' }, { data : 'quantity', title: 'Quantity ()' }, { data : null, title: '', render: actions }, - + ], order: [[ 0, 'asc' ]], lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]], @@ -90,6 +107,9 @@ function name(data, type, row){ }else{ data = 'N/A'; } + if (type === 'export') { + data = row.name; + } return data; } @@ -126,13 +146,14 @@ className : "btn-danger", dataType: 'json', success: function (data) { if(data.success) { - var msg = '
x' + data.success + '
'; - reload_cart_data(); - } else { - var msg = '
x' + data.error + '
'; - - } - $('#innermsg').html(msg); + $('#toast-title').html('' + data.success); + $('.toast-header').removeClass().addClass('toast-header alert-success'); + reload_cart_data(); + }else if(data.error){ + $('#toast-title').html('' + data.error); + $('.toast-header').removeClass().addClass('toast-header alert-danger'); + } + $('.toast').toast('show'); } }); @@ -150,5 +171,9 @@ className : "btn-secondary", }); }); + $('#export_csv').click(() => { + $('#tdDataCart').DataTable().button(0).trigger(); + }); + }); //END DOC \ No newline at end of file diff --git a/pages/manageFormula.php b/pages/manageFormula.php index da733564..c0e9183a 100644 --- a/pages/manageFormula.php +++ b/pages/manageFormula.php @@ -716,13 +716,16 @@ if(mysqli_query($conn, "UPDATE cart SET quantity = quantity + '$quantity' WHERE name = '$material'")){ $response['success'] = 'Additional '.$quantity.$settings['mUnit'].' of '.$material.' added to the cart.'; } + echo json_encode($response); + return; } if(mysqli_query($conn, "INSERT INTO cart (ingID,name,quantity,purity) VALUES ('$ingID','$material','$quantity','$purity')")){ $response['success'] = $material.' added to the cart!'; + echo json_encode($response); + return; } - echo json_encode($response); return; } diff --git a/pages/top.php b/pages/top.php index 5f5258e7..e4094d9f 100755 --- a/pages/top.php +++ b/pages/top.php @@ -45,11 +45,10 @@
  • -
    @@ -105,7 +104,7 @@ var relUrl = 'https://raw.githubusercontent.com/globaldyne/parfumvault/master/releasenotes.md'; $('#new-rel').load(relUrl); - console.log(relUrl); + //console.log(relUrl); }); diff --git a/releasenotes.md b/releasenotes.md index 17d4bcae..c4e60639 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,3 +1,5 @@ Whats New in v10.9 -------------------------- +- 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 1f8584cc96e50487c5536b02a5357d60feb90b6c Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 12:15:10 +0100 Subject: [PATCH 03/39] - To Declare option is now moved under Udage and Limits section for ingredients --- CHANGELOG.md | 1 + pages/update_data.php | 6 +++--- pages/views/ingredients/mgmGeneral.php | 13 ++++-------- pages/views/ingredients/usageData.php | 29 ++++++++++++++++++-------- releasenotes.md | 1 + 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 868d631b..d3fde9c9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG ### Version 10.9 +- 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 - Added a toast message for the cart actions diff --git a/pages/update_data.php b/pages/update_data.php index 4e0dce1c..c42b7700 100755 --- a/pages/update_data.php +++ b/pages/update_data.php @@ -1502,7 +1502,6 @@ function formatVal($num){ $einecs = preg_replace('/\s+/', '', trim(mysqli_real_escape_string($conn, $_POST["einecs"]))); $reach = preg_replace('/\s+/', '', trim(mysqli_real_escape_string($conn, $_POST["reach"]))); $fema = preg_replace('/\s+/', '', trim(mysqli_real_escape_string($conn, $_POST["fema"]))); - if($_POST["isAllergen"] == 'true') { $allergen = '1'; }else{ $allergen = '0'; } $purity = validateInput($_POST["purity"]); $profile = mysqli_real_escape_string($conn, $_POST["profile"]); $type = mysqli_real_escape_string($conn, $_POST["type"]); @@ -1515,7 +1514,7 @@ function formatVal($num){ // if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE name = '".$_POST['name']."'"))){ if(empty($_POST['name'])){ - $query = "UPDATE ingredients SET INCI = '$INCI',cas = '$cas',solvent='".$_POST["solvent"]."', einecs = '$einecs', reach = '$reach',FEMA = '$fema',allergen='$allergen',purity='$purity',profile='$profile',type = '$type',strength = '$strength', category='$category',physical_state = '$physical_state',odor = '$odor',notes = '$notes' WHERE name='$ing'"; + $query = "UPDATE ingredients SET INCI = '$INCI',cas = '$cas',solvent='".$_POST["solvent"]."', einecs = '$einecs', reach = '$reach',FEMA = '$fema',purity='$purity',profile='$profile',type = '$type',strength = '$strength', category='$category',physical_state = '$physical_state',odor = '$odor',notes = '$notes' WHERE name='$ing'"; if(mysqli_query($conn, $query)){ $response["success"] = 'General details have been updated!'; @@ -1547,6 +1546,7 @@ function formatVal($num){ if($_POST['flavor_use'] == 'true') { $flavor_use = '1'; }else{ $flavor_use = '0'; } if($_POST['noUsageLimit'] == 'true'){ $noUsageLimit = '1'; }else{ $noUsageLimit = '0'; } if($_POST['byPassIFRA'] == 'true'){ $byPassIFRA = '1'; }else{ $byPassIFRA = '0'; } + if($_POST["isAllergen"] == 'true') { $allergen = '1'; }else{ $allergen = '0'; } $usage_type = mysqli_real_escape_string($conn, $_POST['usage_type']); $cat1 = validateInput($_POST['cat1'] ?: '100'); $cat2 = validateInput($_POST['cat2'] ?: '100'); @@ -1567,7 +1567,7 @@ function formatVal($num){ $cat11B = validateInput($_POST['cat11B'] ?: '100'); $cat12 = validateInput($_POST['cat12'] ?: '100'); - $query = "UPDATE ingredients SET byPassIFRA = '$byPassIFRA', noUsageLimit = '$noUsageLimit',flavor_use='$flavor_use',usage_type = '$usage_type', cat1 = '$cat1', cat2 = '$cat2', cat3 = '$cat3', cat4 = '$cat4', cat5A = '$cat5A', cat5B = '$cat5B', cat5C = '$cat5C', cat5D = '$cat5D', cat6 = '$cat6', cat7A = '$cat7A', cat7B = '$cat7B', cat8 = '$cat8', cat9 = '$cat9', cat10A = '$cat10A', cat10B = '$cat10B', cat11A = '$cat11A', cat11B = '$cat11B', cat12 = '$cat12' WHERE id='$ingID'"; + $query = "UPDATE ingredients SET byPassIFRA = '$byPassIFRA', noUsageLimit = '$noUsageLimit',flavor_use='$flavor_use',usage_type = '$usage_type', allergen='$allergen', cat1 = '$cat1', cat2 = '$cat2', cat3 = '$cat3', cat4 = '$cat4', cat5A = '$cat5A', cat5B = '$cat5B', cat5C = '$cat5C', cat5D = '$cat5D', cat6 = '$cat6', cat7A = '$cat7A', cat7B = '$cat7B', cat8 = '$cat8', cat9 = '$cat9', cat10A = '$cat10A', cat10B = '$cat10B', cat11A = '$cat11A', cat11B = '$cat11B', cat12 = '$cat12' WHERE id='$ingID'"; if(mysqli_query($conn, $query)){ $response["success"] = 'Usage limits has been updated!'; }else{ diff --git a/pages/views/ingredients/mgmGeneral.php b/pages/views/ingredients/mgmGeneral.php index ba5e953a..1c67747d 100644 --- a/pages/views/ingredients/mgmGeneral.php +++ b/pages/views/ingredients/mgmGeneral.php @@ -33,7 +33,7 @@
    - +
    @@ -119,10 +119,6 @@
    -
    - - checked="checked" /> -
    @@ -138,17 +134,17 @@ \ No newline at end of file diff --git a/pages/views/ingredients/synonyms.php b/pages/views/ingredients/synonyms.php index d2f396ee..2188bae2 100644 --- a/pages/views/ingredients/synonyms.php +++ b/pages/views/ingredients/synonyms.php @@ -41,160 +41,166 @@
    -
    - Name: - -

    - Source: - -

    +
    +
    + + +
    +
    + + +
    From 2773480917ee4dad98c2241460d7318d7f9175ff Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 18:48:59 +0100 Subject: [PATCH 10/39] - Path updates --- pages/views/ingredients/synonyms.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/views/ingredients/synonyms.php b/pages/views/ingredients/synonyms.php index 2188bae2..2e05363c 100644 --- a/pages/views/ingredients/synonyms.php +++ b/pages/views/ingredients/synonyms.php @@ -85,7 +85,7 @@ function synActions(data, type, row){ container: 'body', selector: 'i.synonym', type: 'POST', - url: "update_data.php?synonym=update&ing=", + url: "/pages/update_data.php?synonym=update&ing=", title: 'Synonym' }); @@ -93,7 +93,7 @@ function synActions(data, type, row){ container: 'body', selector: 'i.source', type: 'POST', - url: "update_data.php?synonym=update&ing=", + url: "/pages/update_data.php?synonym=update&ing=", title: 'Source' }); @@ -113,7 +113,7 @@ className : "btn-danger", callback: function (){ $.ajax({ - url: 'update_data.php', + url: '/pages/update_data.php', type: 'GET', data: { synonym: 'delete', From cca252c761e11e42b03929901e50f91737798b55 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 18:57:24 +0100 Subject: [PATCH 11/39] - Path updates --- pages/views/ingredients/ingDocuments.php | 290 ++++++++++++----------- pages/views/ingredients/synonyms.php | 4 +- 2 files changed, 150 insertions(+), 144 deletions(-) diff --git a/pages/views/ingredients/ingDocuments.php b/pages/views/ingredients/ingDocuments.php index f38de198..635c35e0 100644 --- a/pages/views/ingredients/ingDocuments.php +++ b/pages/views/ingredients/ingDocuments.php @@ -14,7 +14,7 @@
    -
    +
  • Add new
    • @@ -38,152 +38,158 @@ $('[data-bs-toggle="tooltip"]').tooltip(); var tdIngDocs = $('#tdIngDocs').DataTable( { - columnDefs: [ - { className: 'text-center', targets: '_all' }, - { orderable: false, targets: [4]} - ], - dom: 'lfrtip', - processing: true, - language: { - loadingRecords: ' ', - processing: 'Loading...', - emptyTable: 'No documents added yet.', - search: 'Search:' + columnDefs: [ + { className: 'text-center', targets: '_all' }, + { orderable: false, targets: [4]} + ], + dom: 'lfrtip', + processing: true, + language: { + loadingRecords: ' ', + processing: 'Loading...', + emptyTable: 'No documents added yet.', + search: 'Search:' }, - ajax: { url: '/core/list_ing_doc_data.php?id=' }, - columns: [ - { data : 'name', title: 'Document', render: dName }, - { data : 'docData', title: 'File', render: docData}, - { data : 'notes', title: 'Notes', render: dNotes}, - { data : 'docSize', title: 'Size'}, - { data : null, title: '', render: dActions}, - ], - order: [[ 1, 'asc' ]], - lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]], - pageLength: 20, - displayLength: 20, + ajax: { url: '/core/list_ing_doc_data.php?id=' }, + columns: [ + { data : 'name', title: 'Document', render: dName }, + { data : 'docData', title: 'File', render: docData}, + { data : 'notes', title: 'Notes', render: dNotes}, + { data : 'docSize', title: 'Size'}, + { data : null, title: '', render: dActions}, + ], + order: [[ 1, 'asc' ]], + lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]], + pageLength: 20, + displayLength: 20, }); -}); -function dName(data, type, row){ - return ''+row.name+''; -} -function docData(data, type, row){ - return ''; -} -function dNotes(data, type, row){ - return ''+row.notes+''; -} -function dActions(data, type, row){ - return ''; -} + + function dName(data, type, row){ + return ''+row.name+''; + }; + + function docData(data, type, row){ + return ''; + }; + + function dNotes(data, type, row){ + return ''+row.notes+'' + }; + + function dActions(data, type, row){ + return '' + }; -$('#tdIngDocs').editable({ - container: 'body', - selector: 'i.name', - type: 'POST', - url: "update_data.php?ingDoc=update&ingID=", - title: 'Document name', - }); + $('#tdIngDocs').editable({ + container: 'body', + selector: 'i.name', + type: 'POST', + url: "/pages/update_data.php?ingDoc=update&ingID=", + title: 'Document name', + }); $('#tdIngDocs').editable({ container: 'body', selector: 'i.notes', type: 'POST', - url: "update_data.php?ingDoc=update&ingID=", + url: "/pages/update_data.php?ingDoc=update&ingID=", title: 'Notes', }); -$('#tdIngDocs').on('click', '[id*=dDel]', function () { - var d = {}; - d.ID = $(this).attr('data-id'); - d.Name = $(this).attr('data-name'); - - bootbox.dialog({ - title: "Confirm document removal", - message : 'Remove '+ d.Name +' from the list?', - buttons :{ - main: { - label : "Remove", - className : "btn-danger", - callback: function (){ - - $.ajax({ - url: 'update_data.php', - type: 'GET', - data: { - doc: 'delete', - id: d.ID, - ownerID: '' + $('#tdIngDocs').on('click', '[id*=dDel]', function () { + var d = {}; + d.ID = $(this).attr('data-id'); + d.Name = $(this).attr('data-name'); + + bootbox.dialog({ + title: "Confirm document removal", + message : 'Remove '+ d.Name +' from the list?', + buttons :{ + main: { + label : "Remove", + className : "btn-danger", + callback: function (){ + + $.ajax({ + url: '/pages/update_data.php', + type: 'GET', + data: { + doc: 'delete', + id: d.ID, + ownerID: '' }, - dataType: 'html', - success: function (data) { - $('#msg_doc').html(data); - reload_doc_data(); - } - }); - - return true; - } - }, - cancel: { - label : "Cancel", - className : "btn-secondary", - callback : function() { - return true; - } - } - },onEscape: function () {return true;} - }); -}); - -$('#addDoc').on('click', '[id*=doc_upload]', function () { - - $("#doc_inf").html('
    Please wait, file upload in progress....
    '); - $("#doc_upload").prop("disabled", true); - $("#doc_upload").prop('value', 'Please wait...'); - - var fd = new FormData(); - var files = $('#doc_file')[0].files; - var doc_name = $('#doc_name').val(); - var doc_notes = $('#doc_notes').val(); + dataType: 'html', + success: function (data) { + $('#msg_doc').html(data); + reload_doc_data(); + } + }); + + return true; + } + }, + cancel: { + label : "Cancel", + className : "btn-secondary", + callback : function() { + return true; + } + } + },onEscape: function () {return true;} + }); + }); - if(files.length > 0 ){ - fd.append('doc_file',files[0]); + $('#addDoc').on('click', '[id*=doc_upload]', function () { + + $("#doc_inf").html('
    Please wait, file upload in progress....
    '); + $("#doc_upload").prop("disabled", true); + $("#doc_upload").prop('value', 'Please wait...'); + + var fd = new FormData(); + var files = $('#doc_file')[0].files; + var doc_name = $('#doc_name').val(); + var doc_notes = $('#doc_notes').val(); + + if(files.length > 0 ){ + fd.append('doc_file',files[0]); + + $.ajax({ + url: '/pages/upload.php?type=1&doc_name=' + btoa(doc_name) + '&doc_notes=' + btoa(doc_notes) + '&id=', + type: 'POST', + data: fd, + dataType: 'json', + contentType: false, + processData: false, + cache: false, + success: function(response){ + if(response.success){ + var msg = '
    x' + response.success + '
    '; + $("#doc_upload").prop("disabled", false); + $("#doc_upload").prop('value', 'Upload'); + reload_doc_data(); + }else{ + $("#doc_inf").html('
    x' + response.error + '
    '); + $("#doc_upload").prop("disabled", false); + $("#doc_upload").prop('value', 'Upload'); + } + $('#doc_inf').html(msg); + }, + }); + }else{ + $("#doc_inf").html('
    xError: Please select a file to upload!
    '); + $("#doc_upload").prop("disabled", false); + $("#doc_upload").prop('value', 'Upload'); + } + + }); - $.ajax({ - url: 'upload.php?type=1&doc_name=' + btoa(doc_name) + '&doc_notes=' + btoa(doc_notes) + '&id=', - type: 'POST', - data: fd, - dataType: 'json', - contentType: false, - processData: false, - cache: false, - success: function(response){ - if(response.success){ - var msg = '
    x' + response.success + '
    '; - $("#doc_upload").prop("disabled", false); - $("#doc_upload").prop('value', 'Upload'); - reload_doc_data(); - }else{ - $("#doc_inf").html('
    x' + response.error + '
    '); - $("#doc_upload").prop("disabled", false); - $("#doc_upload").prop('value', 'Upload'); - } - $('#doc_inf').html(msg); - }, - }); - }else{ - $("#doc_inf").html('
    xError: Please select a file to upload!
    '); - $("#doc_upload").prop("disabled", false); - $("#doc_upload").prop('value', 'Upload'); - } - + function reload_doc_data() { + $('#tdIngDocs').DataTable().ajax.reload(null, true); + }; + }); -function reload_doc_data() { - $('#tdIngDocs').DataTable().ajax.reload(null, true); -}; @@ -195,20 +201,20 @@ function reload_doc_data() {
    Add document
    -
    -

    - Document name: - -

    -

    - Notes: +

    +
    + + +
    +
    + -

    -

    - File: +

    +
    + -

    -
    +
    +
    diff --git a/pages/views/ingredients/synonyms.php b/pages/views/ingredients/synonyms.php index 2e05363c..711335aa 100644 --- a/pages/views/ingredients/synonyms.php +++ b/pages/views/ingredients/synonyms.php @@ -16,8 +16,8 @@
    -
    -
  • Add new
    • +
    +
  • Add new
  • Import from PubChem
    • From 7c8c96cbc9732ac59be53a76c0ec16886ba9d906 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 19:04:16 +0100 Subject: [PATCH 12/39] - Hide privacy tab for ingredients as is not yet utilised --- CHANGELOG.md | 2 + pages/mgmIngredient.php | 6 +- pages/views/ingredients/techData.php | 109 ++++++++++++++------------- 3 files changed, 61 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf54ae8..a3d4d972 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # CHANGELOG ### Version 10.9 +- Hide privacy tab for ingredients as is not yet utilised +- Tech data page updates - Update synonyms backend to json format - If Prohibition is selected in ingredient usage and limits then the usage values set to 0 - Rewrite backend for usage and limits update diff --git a/pages/mgmIngredient.php b/pages/mgmIngredient.php index cb277d07..9c662c81 100755 --- a/pages/mgmIngredient.php +++ b/pages/mgmIngredient.php @@ -140,9 +140,11 @@ Pub Chem - diff --git a/pages/views/ingredients/techData.php b/pages/views/ingredients/techData.php index 5140da5f..86756fe7 100644 --- a/pages/views/ingredients/techData.php +++ b/pages/views/ingredients/techData.php @@ -18,96 +18,97 @@
    - -
    +
    +
    -
    -
    - -
    +
    +
    +
    - -
    +
    +
    -
    -
    - -
    +
    +
    +
    - -
    +
    +
    -
    -
    - -
    +
    +
    +
    - -
    +
    +
    -
    -
    - -
    +
    +
    +
    - -
    +
    +
    +
    + From f26a2e99e5f4830cacc4ecb27d09eb46aa1abf14 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 19:15:18 +0100 Subject: [PATCH 13/39] - Compostion page updates and improvements --- CHANGELOG.md | 1 + pages/views/ingredients/compos.php | 546 ++++++++++++----------- pages/views/ingredients/ingSuppliers.php | 2 +- 3 files changed, 279 insertions(+), 270 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d4d972..34b746c2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG ### Version 10.9 +- Compostion page updates and improvements - Hide privacy tab for ingredients as is not yet utilised - Tech data page updates - Update synonyms backend to json format diff --git a/pages/views/ingredients/compos.php b/pages/views/ingredients/compos.php index d14ebc29..9e5c3b27 100644 --- a/pages/views/ingredients/compos.php +++ b/pages/views/ingredients/compos.php @@ -134,279 +134,291 @@ } }); -});//DOC - -function cmpName(data, type, row){ - return ''+row.name+''; -}; - -function cmpCAS(data, type, row){ - return ''+row.cas+''; -}; - -function cmpEC(data, type, row){ - return ''+row.ec+''; -}; - -function cmpMinPerc(data, type, row){ - return ''+row.min_percentage+''; -}; - -function cmpMaxPerc(data, type, row){ - return ''+row.max_percentage+''; -}; - -function cmpGHS(data, type, row){ - return ''+row.GHS+''; -}; - -function cmpDeclare(data, type, row){ - if(row.toDeclare == 0){ - var declare = 'No'; - }else if(row.toDeclare == 1){ - var declare = 'Yes'; - } - return ''+declare+''; -}; - -function cmpActions(data, type, row){ - return ''; -} - -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.name', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'Name' -}); - -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.cas', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'CAS' -}); - -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.ec', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'EINECS', -}); - -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.min_percentage', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'Min percentage', - success: function (data) { - reload_cmp_data(); - } -}); -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.max_percentage', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'Max percentage', - success: function (data) { - reload_cmp_data(); - } -}); - -$('#tdCompositions').editable({ - container: 'body', - selector: 'i.GHS', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'GHS' -}); - -$('#tdCompositions').editable({ - pvnoresp: false, - highlight: false, - emptytext: "", - emptyclass: "", - container: 'body', - selector: 'i.toDeclare', - type: 'POST', - url: "/pages/update_data.php?composition=update&ing=", - title: 'To be declared', - source: [ - {value: '0', text: 'No'}, - {value: '1', text: 'Yes'}, - ], - success: function (data) { - reload_cmp_data(); - } -}); - -$('#tdCompositions').on('click', '[id*=cmpDel]', function () { - var cmp = {}; - cmp.ID = $(this).attr('data-id'); - cmp.Name = $(this).attr('data-name'); - - bootbox.dialog({ - title: "Confirm removal", - message : 'Remove '+ cmp.Name +' from the list?', - buttons :{ - main: { - label : "Remove", - className : "btn-danger", - callback: function (){ - - $.ajax({ - url: '/pages/update_data.php', - type: 'POST', - data: { - composition: 'delete', - allgID: cmp.ID, - ing: '' - }, - dataType: 'json', - success: function (data) { - reload_cmp_data(); - } - }); - - return true; - } - }, - cancel: { - label : "Cancel", - className : "btn-secondary", - callback : function() { - return true; - } - } - },onEscape: function () {return true;} - }); -}); - - -$('#addComposition').on('click', '[id*=cmpAdd]', function () { - $.ajax({ - url: '/pages/update_data.php', + function cmpName(data, type, row){ + return ''+row.name+''; + }; + + function cmpCAS(data, type, row){ + return ''+row.cas+''; + }; + + function cmpEC(data, type, row){ + return ''+row.ec+''; + }; + + function cmpMinPerc(data, type, row){ + return ''+row.min_percentage+''; + }; + + function cmpMaxPerc(data, type, row){ + return ''+row.max_percentage+''; + }; + + function cmpGHS(data, type, row){ + return ''+row.GHS+''; + }; + + function cmpDeclare(data, type, row){ + if(row.toDeclare == 0){ + var declare = 'No'; + }else if(row.toDeclare == 1){ + var declare = 'Yes'; + } + return ''+declare+''; + }; + + function cmpActions(data, type, row){ + return ''; + }; + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.name', type: 'POST', - data: { - composition: 'add', - allgName: $("#allgName").val(), - minPerc: $("#minPerc").val(), - maxPerc: $("#maxPerc").val(), - allgCAS: $("#allgCAS").val(), - allgEC: $("#allgEC").val(), - GHS: $("#GHS").val(), - addToIng: $("#addToIng").is(':checked'), - addToDeclare: $("#addToDeclare").is(':checked'), - ing: '' - }, - dataType: 'json', + url: "/pages/update_data.php?composition=update&ing=", + title: 'Name' + }); + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.cas', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'CAS' + }); + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.ec', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'EINECS', + }); + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.min_percentage', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'Min percentage', + success: function (data) { + reload_cmp_data(); + } + }); + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.max_percentage', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'Max percentage', success: function (data) { - if (data.success) { - var msg = '
    x' + data.success + '
    '; - $("#allgName").val(''); - $("#allgCAS").val(''); - $("#allgEC").val(''); - $("#minPerc").val(''); - $("#maxPerc").val(''); - $("#GHS").val(''); reload_cmp_data(); - }else{ - var msg = '
    x' + data.error + '
    '; + } + }); + + $('#tdCompositions').editable({ + container: 'body', + selector: 'i.GHS', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'GHS' + }); + + $('#tdCompositions').editable({ + pvnoresp: false, + highlight: false, + emptytext: "", + emptyclass: "", + container: 'body', + selector: 'i.toDeclare', + type: 'POST', + url: "/pages/update_data.php?composition=update&ing=", + title: 'To be declared', + source: [ + {value: '0', text: 'No'}, + {value: '1', text: 'Yes'}, + ], + success: function (data) { + reload_cmp_data(); + } + }); + + $('#tdCompositions').on('click', '[id*=cmpDel]', function () { + var cmp = {}; + cmp.ID = $(this).attr('data-id'); + cmp.Name = $(this).attr('data-name'); + + bootbox.dialog({ + title: "Confirm removal", + message : 'Remove '+ cmp.Name +' from the list?', + buttons :{ + main: { + label : "Remove", + className : "btn-danger", + callback: function (){ + + $.ajax({ + url: '/pages/update_data.php', + type: 'POST', + data: { + composition: 'delete', + allgID: cmp.ID, + ing: '' + }, + dataType: 'json', + success: function (data) { + reload_cmp_data(); + } + }); + + return true; + } + }, + cancel: { + label : "Cancel", + className : "btn-secondary", + callback : function() { + return true; + } + } + },onEscape: function () {return true;} + }); + }); + + + $('#addComposition').on('click', '[id*=cmpAdd]', function () { + $.ajax({ + url: '/pages/update_data.php', + type: 'POST', + data: { + composition: 'add', + allgName: $("#allgName").val(), + minPerc: $("#minPerc").val(), + maxPerc: $("#maxPerc").val(), + allgCAS: $("#allgCAS").val(), + allgEC: $("#allgEC").val(), + GHS: $("#GHS").val(), + addToIng: $("#addToIng").is(':checked'), + addToDeclare: $("#addToDeclare").is(':checked'), + ing: '' + }, + dataType: 'json', + success: function (data) { + if (data.success) { + var msg = '
    x' + data.success + '
    '; + $("#allgName").val(''); + $("#allgCAS").val(''); + $("#allgEC").val(''); + $("#minPerc").val(''); + $("#maxPerc").val(''); + $("#GHS").val(''); + reload_cmp_data(); + }else{ + var msg = '
    x' + data.error + '
    '; + } + + $('#inf').html(msg); + } - - $('#inf').html(msg); - + }); + }); + + $('#addCSV').on('click', '[id*=cmpCSV]', function () { + $("#CSVImportMsg").html('
    Please wait, file upload in progress....
    '); + $("#cmpCSV").prop("disabled", true); + + var fd = new FormData(); + var files = $('#CSVFile')[0].files; + + if(files.length > 0 ){ + fd.append('CSVFile',files[0]); + $.ajax({ + url: '/pages/upload.php?type=cmpCSVImport&ingID=', + type: 'POST', + data: fd, + contentType: false, + processData: false, + cache: false, + success: function(response){ + if(response != 0){ + $("#CSVImportMsg").html(response); + $("#cmpCSV").prop("disabled", false); + reload_cmp_data(); + }else{ + $("#CSVImportMsg").html('
    xError: File upload failed!
    '); + $("#cmpCSV").prop("disabled", false); + } + }, + }); + }else{ + $("#CSVImportMsg").html('
    xError: Please select a file to upload!
    '); + $("#cmpCSV").prop("disabled", false); } - }); -}); - -$('#addCSV').on('click', '[id*=cmpCSV]', function () { - $("#CSVImportMsg").html('
    Please wait, file upload in progress....
    '); - $("#cmpCSV").prop("disabled", true); - - var fd = new FormData(); - var files = $('#CSVFile')[0].files; + }); + + function reload_cmp_data() { + $('#tdCompositions').DataTable().ajax.reload(null, true); + }; - if(files.length > 0 ){ - fd.append('CSVFile',files[0]); - $.ajax({ - url: '/pages/upload.php?type=cmpCSVImport&ingID=', - type: 'POST', - data: fd, - contentType: false, - processData: false, - cache: false, - success: function(response){ - if(response != 0){ - $("#CSVImportMsg").html(response); - $("#cmpCSV").prop("disabled", false); - reload_cmp_data(); - }else{ - $("#CSVImportMsg").html('
    xError: File upload failed!
    '); - $("#cmpCSV").prop("disabled", false); - } - }, - }); - }else{ - $("#CSVImportMsg").html('
    xError: Please select a file to upload!
    '); - $("#cmpCSV").prop("disabled", false); - } -}); +});//DOC -function reload_cmp_data() { - $('#tdCompositions').DataTable().ajax.reload(null, true); -}; -
    - - - - - - - - - - -

    Olfactive family

    Physical State

    + +
    +
    +

    Olfactive family

    +
    +
    +

    +
    +
    +

    Physical State

    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + From 8fdfa74c2598bbf8266009daf3aeeb4da526b350 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 10 Aug 2024 21:31:58 +0100 Subject: [PATCH 17/39] - Minor UI update --- pages/compounds.php | 2 +- pages/customers.php | 370 ++++++++++++++++++++++---------------------- 2 files changed, 183 insertions(+), 189 deletions(-) diff --git a/pages/compounds.php b/pages/compounds.php index 4e2bbfa4..f3d99e93 100644 --- a/pages/compounds.php +++ b/pages/compounds.php @@ -58,7 +58,7 @@