@jd-data-limited/easy-fm 3.0.7 → 3.0.9

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",
     "moment": "^2.29.4",
     "node-fetch": "3.2.8",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.4",
+    "ytdl-core": "^4.11.4"
   },
   "type": "module",
   "main": "src/index.js",

package/src/index.js

@@ -1300,7 +1300,12 @@ export class Layout {
             })
                 .then(res => {
                 if (res.messages[0].code === "0") {
-                    resolve(res.response);
+                    let error = parseInt(res.response.scriptError);
+                    let msg = {
+                        scriptError: error ? new FMError(error, 200, res, trace) : undefined,
+                        scriptResult: res.response.scriptResult
+                    };
+                    resolve(msg);
                 }
                 else {
                     // console.log(res)
@@ -1483,17 +1488,17 @@ export class LayoutRecord extends RecordBase {
             if ((_a = extraBody.scripts) === null || _a === void 0 ? void 0 : _a.after) {
                 data["script"] = extraBody.scripts.after.name;
                 if (extraBody.scripts.after.parameter)
-                    data["param"] = extraBody.scripts.after.parameter;
+                    data["script.param"] = extraBody.scripts.after.parameter;
             }
             if ((_b = extraBody.scripts) === null || _b === void 0 ? void 0 : _b.prerequest) {
-                data["script"] = extraBody.scripts.after.name;
+                data["script.prerequest"] = extraBody.scripts.after.name;
                 if (extraBody.scripts.prerequest.parameter)
-                    data["param"] = extraBody.scripts.prerequest.parameter;
+                    data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter;
             }
             if ((_c = extraBody.scripts) === null || _c === void 0 ? void 0 : _c.presort) {
-                data["script"] = extraBody.scripts.presort.name;
+                data["script.presort"] = extraBody.scripts.presort.name;
                 if (extraBody.scripts.presort.parameter)
-                    data["param"] = extraBody.scripts.presort.parameter;
+                    data["script.presort.param"] = extraBody.scripts.presort.parameter;
             }
             if (this.recordId === -1) {
                 // This is a new LayoutRecord

package/src/index.ts

@@ -1146,6 +1146,11 @@ interface FMHostMetadata {
     }
 }
 
+export interface ScriptResult {
+    scriptError?: FMError,
+    scriptResult?: string
+}
+
 export interface ContainerBufferResult {
     buffer: Buffer,
     mime: string,
@@ -1441,9 +1446,9 @@ export class Layout {
         return this.records.find()
     }
 
-    runScript(script): Promise<string> {
+    runScript(script): Promise<ScriptResult> {
         let trace = new Error()
-        return new Promise(async (resolve, reject) => {
+        return new Promise(async (resolve, reject)  => {
             let url = `${this.endpoint}/script/${encodeURIComponent(script.name)}`
             if (script.parameter) url += "?script.param=" + encodeURIComponent(script.parameter)
             this.database.apiRequest(url, {
@@ -1452,7 +1457,12 @@ export class Layout {
             })
                 .then(res => {
                     if (res.messages[0].code === "0") {
-                        resolve(res.response)
+                        let error = parseInt(res.response.scriptError)
+                        let msg: ScriptResult = {
+                            scriptError: error ? new FMError(error, 200, res, trace) : undefined,
+                            scriptResult: res.response.scriptResult
+                        }
+                        resolve(msg)
                     }
                     else {
                         // console.log(res)
@@ -1666,15 +1676,15 @@ export class LayoutRecord extends RecordBase {
 
             if (extraBody.scripts?.after) {
                 data["script"] = extraBody.scripts.after.name
-                if (extraBody.scripts.after.parameter) data["param"] = extraBody.scripts.after.parameter
+                if (extraBody.scripts.after.parameter) data["script.param"] = extraBody.scripts.after.parameter
             }
             if (extraBody.scripts?.prerequest) {
-                data["script"] = extraBody.scripts.after.name
-                if (extraBody.scripts.prerequest.parameter) data["param"] = extraBody.scripts.prerequest.parameter
+                data["script.prerequest"] = extraBody.scripts.after.name
+                if (extraBody.scripts.prerequest.parameter) data["script.prerequest.param"] = extraBody.scripts.prerequest.parameter
             }
             if (extraBody.scripts?.presort) {
-                data["script"] = extraBody.scripts.presort.name
-                if (extraBody.scripts.presort.parameter) data["param"] = extraBody.scripts.presort.parameter
+                data["script.presort"] = extraBody.scripts.presort.name
+                if (extraBody.scripts.presort.parameter) data["script.presort.param"] = extraBody.scripts.presort.parameter
             }
 
             if (this.recordId === -1) {

package/prop1.toml

@@ -1,58 +0,0 @@
-#Minecraft server properties
-#Wed May 03 20:32:16 AEST 2023
-allow-flight=false
-allow-nether=true
-broadcast-console-to-ops=true
-broadcast-rcon-to-ops=true
-difficulty=easy
-enable-command-block=false
-enable-jmx-monitoring=false
-enable-query=false
-enable-rcon=false
-enable-status=true
-enforce-secure-profile=true
-enforce-whitelist=false
-entity-broadcast-range-percentage=100
-force-gamemode=false
-function-permission-level=2
-gamemode=survival
-generate-structures=true
-generator-settings={}
-hardcore=false
-hide-online-players=false
-level-name=world
-level-seed=
-level-type=minecraft\:normal
-max-chained-neighbor-updates=1000000
-max-players=20
-max-threads=6
-max-tick-time=-1
-max-world-size=29999984
-motd=A Minecraft Server
-network-compression-threshold=256
-online-mode=false
-op-permission-level=4
-player-idle-timeout=0
-prevent-proxy-connections=false
-previews-chat=false
-pvp=true
-query.port=25565
-rate-limit=0
-rcon.password=
-rcon.port=25575
-require-resource-pack=false
-resource-pack=
-resource-pack-prompt=
-resource-pack-sha1=
-server-ip=119.252.189.11
-server-port=27002
-simulation-distance=10
-spawn-animals=true
-spawn-monsters=true
-spawn-npcs=true
-spawn-protection=16
-sync-chunk-writes=false
-text-filtering-config=
-use-native-transport=true
-view-distance=10
-white-list=false

package/prop2.toml

@@ -1,58 +0,0 @@
-#Minecraft server properties
-#Wed May 03 12:46:20 CEST 2023
-allow-flight=false
-allow-nether=true
-broadcast-console-to-ops=true
-broadcast-rcon-to-ops=true
-difficulty=easy
-enable-command-block=true
-enable-jmx-monitoring=false
-enable-query=true
-enable-rcon=false
-enable-status=true
-enforce-secure-profile=true
-enforce-whitelist=false
-entity-broadcast-range-percentage=100
-force-gamemode=false
-function-permission-level=2
-gamemode=survival
-generate-structures=true
-generator-settings={}
-hardcore=false
-hide-online-players=false
-level-name=world
-level-seed=
-level-type=minecraft\:normal
-max-chained-neighbor-updates=1000000
-max-players=100
-max-tick-time=60000
-max-world-size=29999984
-motd=4vNBdJ
-network-compression-threshold=256
-online-mode=true
-op-permission-level=4
-player-idle-timeout=0
-prevent-proxy-connections=false
-previews-chat=false
-pvp=true
-query.port=41305
-rate-limit=0
-rcon.password=
-rcon.port=25575
-require-resource-pack=false
-resource-pack=
-resource-pack-prompt=
-resource-pack-sha1=
-server-ip=
-server-port=41305
-simulation-distance=10
-snooper-enabled=false
-spawn-animals=true
-spawn-monsters=true
-spawn-npcs=true
-spawn-protection=16
-sync-chunk-writes=true
-text-filtering-config=
-use-native-transport=true
-view-distance=10
-white-list=false

package/test.js

@@ -1,35 +0,0 @@
-import FMHost from "./src/index.js";
-import * as fs from "fs";
-import {DOWNLOAD_MODES} from "./src/index.js";
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-
-const host = new FMHost("https://192.168.2.128", 0, false)
-const database = host.database({
-    database: "Snapshot_2",
-    credentials: {
-        method: "filemaker",
-        username: "jhawinkels",
-        password: "ZTw8&8E7"
-    },
-    externalSources: []
-})
-database.login()
-    .then(async () => {
-        let layout = database.getLayout("ReportsJSON")
-        await layout.getLayoutMeta()
-        console.log(layout.metadata)
-
-        let record = (await layout.records.range(4, 9).fetch())[0]
-
-        record.getField("In|PartnerID").set("42565F30-5F5D-44A4-83A0-E52128974581")
-
-
-        let portal = record.getPortal("Reports|Archive")
-        let portal_record = portal.create()
-        portal_record.getField("SampleClass").set("Hello!")
-
-        await record.commit()
-        await record.get()
-        console.log(record.getField("__PrimaryKey").value)
-    })

package/test2.js

@@ -1,413 +0,0 @@
-const date = new Date();
-let [month, day, year] = [
-    date.getMonth() + 1,
-    date.getDate(),
-    date.getFullYear(),
-];
-
-if (day < 10) day = '0' + day;
-if (month < 10) month = '0' + month;
-
-console.log(window.location.href);
-var currloc = window.location.href.split('&fname=');
-var location_split = currloc[0].split('&location=');
-console.log(decodeURIComponent(location_split[1]).replace('&', '& '));
-
-var loc = location_split[0].replace('https://www.farmmedix.com/milk-sampling-consent/?location=', '');
-console.log(decodeURIComponent(loc));
-
-$('#date-today').html(day + '/' + month + '/' + year);
-$('#owner_name').html(decodeURIComponent(urlParam("fname")) + ' ' + decodeURI(urlParam("lname")));
-$('#farm-business-name').html('');
-$('#owner-phone').html('');
-$('#owner-email').html(decodeURIComponent(urlParam("email")))
-
-$("input[name=hidden_2]").val(day + '/' + month + '/' + year);
-$("input[name=hidden]").val(decodeURIComponent(urlParam("fname")));
-$("input[name=hidden_11]").val(decodeURIComponent(urlParam("lname")));
-$("input[name=hidden_1]").val(decodeURIComponent(urlParam("business_name")));
-$("input[name=hidden_4]").val(decodeURIComponent(urlParam("email")));
-$("input[name=hidden_3]").val(decodeURIComponent(urlParam("phone")));
-$("input[name=hidden_10]").val(decodeURIComponent(loc));
-$("input[name=hidden_12]").val(decodeURIComponent(urlParam("role")));
-$("input[name=show_staph]").val(decodeURIComponent(urlParam("show_staph")));
-
-$("input[name=show_staph]").trigger("change");
-
-
-var html = '<strong>Farm/Business Name</strong>: ' + decodeURI(urlParam("business_name"));
-html += '<br><strong>Location</strong>: ' + decodeURIComponent(loc);
-html += '<br><strong>First Name</strong>: ' + decodeURI(urlParam("fname"));
-html += '<br><strong>Last Name</strong>: ' + decodeURI(urlParam("lname"));
-html += '<br><strong>Email</strong>: ' + decodeURI(urlParam("email"));
-html += '<br><strong>Phone</strong>: ' + decodeURI(urlParam("phone"));
-html += '<br><strong>Role</strong>: ' + decodeURI(urlParam("role"));
-
-var allsuppliers = decodeURIComponent(urlParam("suppliers")).replace(' ', '').split(',');
-//console.log(decodeURIComponent(allsuppliers));
-
-var lis = '';
-var list_num = 13;
-var extralistnum = 1;
-var suppliers_all = '';
-var output = [];
-var newsupp = [];
-var suppliers_obj = {};
-
-var extra_html = '';
-
-$.each(allsuppliers, function( k, v ) {
-    //newsupp.push(v.split('-'));
-    var o = v.split('-');
-    suppliers_obj[o[0]] += decodeURIComponent(o[1]) + ', ';
-
-    extra_html += '<div style="width: 100%; display: inline-block; color: #000"><strong>'+v.replace('-', ' ')+'</strong></div><div style="width: 100%">';
-    extra_html += '<div><div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Number of animals</label></div><input id="extra-list-animal" class="ff-el-form-control" required="" type="number" data-animal="'+extralistnum+'" aria-required="true" /></div>';
-    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Number of Clinical Mastitis Cases</label></div><input id="extra-list-mastitis" class="ff-el-form-control" required="" type="number" data-mastitis="'+extralistnum+'" aria-required="true" /></div>';
-    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Bulk tank SCC level</label></div><input id="extra-list-scc" class="ff-el-form-control" required="" type="number" data-scc="'+extralistnum+'" aria-required="true" /></div>';
-    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label"><label>Comment on SCC and Mastitis Cases</label></div><textarea id="extra-list-comment" class="ff-el-form-control" data-comment="'+extralistnum+'"></textarea></div>';
-    extra_html += '</div></div>';
-
-    extralistnum++;
-})
-
-$('#extra-fields').html(extra_html);
-
-$.each(suppliers_obj, function( i, v ) {
-//console.log(i, v)
-    //html += '<br><strong>Supplier '+(i+1)+'</strong>: ' + v.replace("-", " - ");
-    suppliers_all += '<span style="color: #000000;">- <b>'+ i + ' ' + v.replace('undefined', '').slice(0, -2) +'</b></span><br>';
-    $('input[name=hidden_'+list_num+']').val('- ' + i + ' ' + v.replace('undefined', '').slice(0, -2));
-    if(i != 'Fonterra'){
-        $('input[name="has_nonfonterra"').val('yes');
-    }
-    list_num++;
-    //extralistnum++;
-});
-
-$('#loc').html(decodeURIComponent(loc))
-$('#suppliers-all').html('');
-$('#total-samples').html('');
-$('#role').html($("input[name=hidden_4]").val());
-$('#user-full-name').html(decodeURIComponent(urlParam("fname")) + ' ' + decodeURIComponent(urlParam("lname")));
-
-$(document).on('change', '#extra-list-animal', function(){
-    var data_id = $(this).data('animal');
-    $('[name="num_animals_'+data_id+'"]').val($(this).val());
-});
-
-$(document).on('change', '#extra-list-mastitis', function(){
-    var data_id = $(this).data('mastitis');
-    $('[name="num_clinical_mastisis_'+data_id+'"]').val($(this).val());
-});
-
-$(document).on('change', '#extra-list-scc', function(){
-    var data_id = $(this).data('scc');
-    $('[name="bulk_tank_scc_'+data_id+'"]').val($(this).val());
-});
-
-$(document).on('change', '#extra-list-comment', function(){
-    var data_id = $(this).data('rolomment');
-    $('[name="comment_scc_'+data_id+'"]').val($(this).val());
-});
-
-//$("input[name=hidden_6]").val(allsuppliers.length);
-
-$('#preview').html(html)
-
-function urlParam(name) {
-    var results = (new RegExp("[\\?&]" + name + "=([^&#]*)")).exec(window.location.href);
-    if (results == null) return null;
-    else return results[1] || 0;
-};
-
-/*** added ***/
-
-var settings = {
-    "url": "https://snapshot-2-testenv-snpgtklz4a-ts.a.run.app/api/v2/farms/simple",
-    "method": "GET",
-    "timeout": 0,
-    "headers": {
-        "Authorization": "Bot L9lrcc3z+MqZFq2QWfiAuvNkbWyjisIA2BehMuLcw9Q=",
-        "Content-Type": "application/json",
-        "Cookie": "GAESA=CoQBMDAxMjE3ODliM2MyNzI0MDMzZTE1Yjk2OTFmOWRiNWNlODliMjhmMWU3YTI2ZjFmYTJiNGE5OGE0ZDBlMjQ1NDhkY2U5MWI5NGM2NzgxOTFmZjBjMTk5NDU4MTgwMTBjYjMwMzNiOWFlYTdkMjk5Zjc3ZDUyYjI4M2UzNjE3OWRmYzYyEMS59cD3MA"
-    },
-};
-
-var allSuppliers = [];
-var suppliersName = [];
-
-$.ajax(settings).done(function (response) {
-    //console.log(response);
-    var ff_11_dropdown_2_val = '';
-    //allSuppliers.push(response);
-    var voidSuppliers = ["TEST SUPPLIER", "UNKNOWN SUPPLIER", ""];
-    $.map(response, function(val) {
-        allSuppliers.push({supplier_name: val.supplierName, id: val.supplierNumber, name: val.bussinessName});
-        if($.inArray(val.supplierName, suppliersName) === -1) {
-            if($.inArray(val.supplierName, voidSuppliers) === -1){
-                suppliersName.push(val.supplierName);
-                ff_11_dropdown_2_val += '<option value="'+val.supplierName+'">'+val.supplierName+'</option>';
-            }
-        }
-    });
-
-    $('#ff_11_dropdown_2').html(ff_11_dropdown_2_val);
-});
-
-//console.log(allSuppliers);
-
-function urlParam(name) {
-    var results = (new RegExp("[\\?&]" + name + "=([^&#]*)")).exec(window.location.href);
-    if (results == null) return null;
-    else return results[1] || 0;
-};
-
-let location = decodeURI(urlParam("location"));
-let formnum = 1;
-
-$('.ff-el-form-check').eq(0).find('input').click();
-$('#ff_11_input_text').val(decodeURI(urlParam("farm_name")) === 'null' ? '' : decodeURI(urlParam("farm_name")));
-$('#ff_11_dropdown option[value="'+location+'"]').attr("selected","selected");
-$('#ff_11_names_first_name_').val(decodeURI(urlParam("fname")) === 'null' ? '' : decodeURI(urlParam("fname")));
-$('#ff_11_names_last_name_').val(decodeURI(urlParam("lname")) === 'null' ? '' : decodeURI(urlParam("lname")));
-$('#ff_11_email').val(decodeURI(urlParam("email")) === 'null' ? '' : decodeURI(urlParam("email")));
-
-$('#add-supplier').click(function(e){
-    e.preventDefault();
-    console.log('new supplier click');
-    formnum++;
-    var newfrm = '<div data-name="ff_cn_id_7" class="ff-t-container ff-column-container ff_columns_total_2 supplier_container"><div class="ff-t-cell ff-t-column-1" style="flex-basis: 50%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="ff_11_dropdown_2" aria-label="Supplier Name 1">Supplier Name '+formnum+'</label> </div><div class="ff-el-input--content"><select name="dropdown_2" id="ff_11_dropdown_2" class="ff-el-form-control" data-name="dropdown_2" data-calc_value="0" aria-invalid="false" aria-required="true"><option value="">– Select Supplier '+ formnum +' –</option><option value="Fonterra">Fonterra</option><option value="Arrabawn">Arrabawn</option><option value="Aurivo">Aurivo</option><option value="Carbery">Carbery</option><option value="Dairy Goat Coop">Dairy Goat Coop</option><option value="Dairygold">Dairygold</option><option value="Green Valley Dairies">Green Valley Dairies</option><option value="Mataura Valley Milk">Mataura Valley Milk</option><option value="Maui">Maui</option><option value="Miraka">Miraka</option><option value="Open Country">Open Country</option><option value="Organic Dairy Hub">Organic Dairy Hub</option><option value="Synlait">Synlait</option><option value="Tatua">Tatua</option><option value="Waiau">Waiau</option><option value="Westland">Westland</option></select></div></div></div><div class="ff-t-cell ff-t-column-2" style="flex-basis: 50%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="ff_11_numeric-field" aria-label="Supplier Number 1">Supplier Number '+formnum+'</label> <span id="remove-supplier">x remove</span></div><div class="ff-el-input--content"><input type="number" name="numeric-field" id="ff_11_numeric-field" class="ff-el-form-control" data-name="numeric-field" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"><div id="res_dropdown"></div></div></div></div></div>';
-    if (decodeURIComponent(urlParam("show_staph")) !== "true") newfrm += "<div style='display:none;'>"
-    newfrm += '<div data-name="ff_cn_id_6" class="ff-t-container ff-column-container ff_columns_total_4 div4 "><div class="ff-t-cell ff-t-column-1" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="number_of_animals_'+formnum+'" aria-label="Number of Animals">Number of Animals</label> </div><div class="ff-el-input--content"><input data-name="num_animals_'+formnum+'" type="number" name="number_of_animals_'+formnum+'" id="extra" class="ff-el-form-control" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"><div id="res_dropdown2"></div></div></div></div><div class="ff-t-cell ff-t-column-2" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="number_of_clinicalmastisis_'+formnum+'" aria-label="Number of Clinical Mastitis Cases">Number of Clinical Mastitis Cases</label> </div><div class="ff-el-input--content"><input type="number" name="number_of_clinicalmastisis_'+formnum+'" id="extra" class="ff-el-form-control" data-name="num_clinical_mastisis_'+formnum+'" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"></div></div></div><div class="ff-t-cell ff-t-column-3" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="bulk_tank_level'+formnum+'" aria-label="Bulk tank SCC level">Bulk tank SCC level</label> </div><div class="ff-el-input--content"><input type="number" name="bulk_tank_level'+formnum+'" id="extra" class="ff-el-form-control" data-name="bulk_tank_scc_'+formnum+'" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"></div></div></div><div class="ff-t-cell ff-t-column-4" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label asterisk-right"><label for="comment_scc_mastisis'+formnum+'" aria-label="Comment on SCC and Mastitis Cases">Comment on SCC and Mastitis Cases</label> </div><div class="ff-el-input--content"><textarea aria-invalid="false" aria-required="false" name="comment_scc_mastisis'+formnum+'" id="extra" class="ff-el-form-control" rows="3" cols="2" data-name="comment_scc_'+formnum+'"></textarea></div></div></div></div>';
-    if (decodeURIComponent(urlParam("show_staph")) !== "true") newfrm += "</div>"
-
-    $('.div4:last').after('<div class="newdiv" id="form-container-'+formnum+'"></div>');
-
-    //$(this).prepend(newfrm)
-    $(document).find("#form-container-"+formnum).html(newfrm);
-});
-
-$(document).on('click', '#remove-supplier', function(){
-    var p = $(this).parent().parent().parent().parent().parent();
-    formnum -= 1;
-    p.remove();
-    console.log(p);
-    fill_suppliers();
-});
-
-//disabled
-$(document).on('click', '#ff_11_numeric-field_disabled', function(){
-    var supplier_name = $(this).parent().parent().parent().parent().find('#ff_11_dropdown_2').val();
-    var result = [];
-    var res = '';
-    var el = $(this);
-    if(supplier_name !== ''){
-        console.log('here' + supplier_name);
-
-        $.map(allSuppliers, function(val) {
-            console.log(val.supplier_name);
-            if(supplier_name == val.supplier_name){
-                result.push({id: val.id, milk_supplier: val.name});
-            }
-
-        });
-
-        $.map(result, function(value) {
-            console.log(value)
-            res += '<div id="milk-supplier" data-id="'+value.id+'">'+value.id+'-'+value.milk_supplier+'</div>';
-        });
-
-        console.log(result);
-
-
-        el.next('#res_dropdown').html(res).css('display', 'block');
-
-
-    }
-
-});
-$('#ff_11_numeric-field').after('<div id="res_dropdown"></div>');
-
-var result = {};
-var result2 = {};
-var allsuppliers = [];
-
-function fill_suppliers(){
-    let suppliers_arr = [];
-    let supplier_arr2 = [{}];
-    $(".supplier_container").each(function() {
-        var supplier = $(this).find('#ff_11_dropdown_2').val();
-        var supplier_id = $(this).find('#ff_11_numeric-field').val();
-        suppliers_arr.push(supplier+'-'+supplier_id);
-        supplier_arr2.push({supplier: supplier, supplier_id: supplier_id});
-    });
-    allsuppliers = [];
-    allsuppliers.push([suppliers_arr]);
-    $('#total-samples').html(suppliers_arr.length);
-    $('[name="hidden_6"]').val(suppliers_arr.length);
-
-    //console.log(supplier_arr2)
-    grouped = [];
-
-    supplier_arr2.forEach(function (hash) {
-        return function (o) {
-            if (!hash[o.supplier]) {
-                hash[o.supplier] = { supplier: o.supplier, supplier_id: '' };
-                grouped.push(hash[o.supplier]);
-            }
-            if(o.supplier !== undefined){
-                hash[o.supplier].supplier_id += o.supplier_id + '|';
-            }
-
-        };
-    }(Object.create(null)));
-
-    var grouped_suppliers = '';
-    $('#suppliers-all').html('');
-//console.log('grouped')
-    let groupnum = 13;
-    grouped.forEach(function (item, index) {
-        //console.log(item.supplier);
-        if(item.supplier !== undefined){
-            grouped_suppliers += '- ' + item.supplier + ' ' + item.supplier_id.substring(0, item.supplier_id.length-1).replace('|', ', ') + '\r\n<br>';
-            $('[name="hidden_'+groupnum+'"]').val(' - ' + item.supplier + ' ' + item.supplier_id.substring(0, item.supplier_id.length-1).replace('|', ', '));
-            groupnum++;
-        }
-
-    });
-
-    //console.log(grouped_suppliers);
-    $('#suppliers-all').html(grouped_suppliers);
-    //$('[name="hidden_suppliers"]').val(allsuppliers);
-    //$('[name="suppliers_field"]').val(grouped_suppliers);
-}
-
-$(document).on('blur', '#ff_11_numeric-field', function(){
-    fill_suppliers();
-    //console.log(allsuppliers)
-    $('[id=res_dropdown]').slideUp();
-});
-
-$(document).on('keyup', '#ff_11_numeric-field_disabled', function(){
-    res = '';
-    var i = $(this).val();
-    var supplier_name = $(this).parent().parent().parent().parent().find('#ff_11_dropdown_2').val();
-    result = [];
-    $.map(suppliers_json[supplier_name], function(val) {
-        result.push(val);
-    });
-
-    $.map(result, function(value) {
-
-        if(i != ''){
-            var varid = value.id;
-            var regex = new RegExp(this.value);
-            res += varid.includes(i) ? '<div id="milk-supplier" data-id="'+value.id+'">'+value.id+'-'+value.milk_supplier+'</div>' : "";
-        }
-    });
-
-    if(i !== ''){
-        $(this).next('#res_dropdown').show();
-        $(this).next('#res_dropdown').html(res);
-    }else{
-        $(this).next('#res_dropdown').hide();
-    }
-
-    res = '';
-});
-
-$(document).on('click', '#milk-supplier', function(){
-    console.log('supplier' + $(this).data('id'));
-    $(this).parent().parent().find('#ff_11_numeric-field').val($(this).data('id'));
-    $(this).parent().parent().find('#ff_11_numeric-field').focus();
-    $('[id=res_dropdown]').slideUp();
-})
-
-$('#ff_11_numeric-field_1').after('<div id="res_dropdown2"></div>');
-
-$("#ff_11_dropdown_3").change(function(){
-    result2 = [];
-    $.map(suppliers_json[this.value], function(val) {
-        result2.push(val);
-    });
-    console.log(result2);
-    console.log(result2);
-});
-
-var all_suppliers = {};
-
-$('#ff_11_numeric-field_1').on('keyup', function(){
-    res2 = '';
-    var i = $(this).val();
-    $.map(result2, function(value) {
-        //res += val.id +'-'+ val.milk_supplier + '\r\n';
-        //console.log(1);
-        if(i !== ''){
-            var varid = value.id;
-            var regex = new RegExp(this.value);
-            //console.log(varid);
-            //console.log(this.value);
-
-            res2 += varid.includes(i) ? '<div>'+value.id+'-'+value.milk_supplier+'</div>' : "";
-            $('#res_dropdown2').css('display', 'block');
-
-            var last_supplier = $(this).prev('#ff_11_dropdown_2').val();
-            //console.log(last_supplier);
-        }
-
-
-    });
-    if(i !== ''){
-        $('#res_dropdown2').html(res2);
-    }else{
-        $('#res_dropdown2').css('display', 'none');
-    }
-
-    res = ''
-});
-
-$('#ff_11_dropdown_2').change(function(){
-    $('#ff_11_numeric-field').val('');
-});
-
-$('#ff_11_phone_1').on('keyup', function(){
-    $('#owner-phone').html($(this).val());
-    $("input[name=hidden_3]").val($(this).val());
-});
-
-$('#ff_11_input_text').on('keyup', function(){
-    $('#farm-business-name').html($(this).val());
-    $("input[name=hidden_1]").val($(this).val());
-});
-
-// $('#ff_11_dropdown_1').change(function(){
-//     $('#role').html($(this).val());
-//     $("input[name=hidden_12]").val($(this).val());
-// });
-
-$(document).on('change', '#extra', function(){
-    var name = $(this).data('name');
-    var value = $(this).val();
-    console.log(name, value);
-    $('input[name="'+name+'"]').val(value);
-});
-
-$('#ff_11_number_of_animals_1').change(function(){
-    var value = $(this).val();
-    $('input[name="num_animals_1"]').val(value);
-});
-$('#ff_11_number_of_clinicalmastisis_1').change(function(){
-    var value = $(this).val();
-    $('input[name="num_clinical_mastisis_1"]').val(value);
-});
-$('#ff_11_bulk_tank_level2').change(function(){
-    var value = $(this).val();
-    $('input[name="bulk_tank_scc_1"]').val(value);
-});
-$('#ff_11_comment_scc_mastisis2').change(function(){
-    var value = $(this).val();
-    $('input[name="comment_scc_1"]').val(value);
-});
-
-